tree 3f2c7fd3b55f9dda2c71d0e1b8129274dea5fc2d
parent f9cd258be2d572095d855fc5ceef330d7b022fc0
parent a67d1ea0db5f536ca4a954a5f958211ec6c99992
author Winson Chung <winsonc@google.com> 1386203748 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1386203748 -0800

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

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