tree 8e167d93d9580663afc4a164971a9e01c3ea627e
parent ad7e86fbc364c8d14ff60180f2c3a413dce7b432
parent 86ee1473fbb53e4fa75b284711ae08cc798c73c9
author Winson Chung <winsonc@google.com> 1392411740 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1392411740 +0000

am 86ee1473: am 9026ce17: am 58705534: am a67d1ea0: Merge "Fixing regression in drop target bar height. (Bug 11980757)" into jb-ub-now-jolly-elf

* commit '86ee1473fbb53e4fa75b284711ae08cc798c73c9':
  Fixing regression in drop target bar height. (Bug 11980757)