tree 0340d388a61d1acd9b33743e62fab161a663d67b
parent b2d3890df47fb9400c45226c4a3c4f4802536469
parent 58705534ab953c6394269da671cf60066f216815
author Winson Chung <winsonc@google.com> 1392410308 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1392410308 +0000

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

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