tree 10da860fcff71886af91d082e31f0e1917926848
parent eed36eba6832b04b66cf02f8b39eeb4d55b99550
parent 3826d2b460d86ffcd99855b82a37b20f06071ec7
author Winson Chung <winsonc@google.com> 1414566398 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1414566398 +0000

am 3826d2b4: 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 '3826d2b460d86ffcd99855b82a37b20f06071ec7':