tree 8e167d93d9580663afc4a164971a9e01c3ea627e
parent 94abcb984719c8a3f6a3cff14aad3d95a8c9df26
parent 9026ce177afb710d753020931a942665a0ce7f81
author Winson Chung <winsonc@google.com> 1392411263 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1392411263 +0000

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

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