tree cba62d0d64153aa2169651696bc238591341d679
parent c686d62cf64a4eb9c51b7145a83d6543442c93dd
parent 86ee1473fbb53e4fa75b284711ae08cc798c73c9
author Winson Chung <winsonc@google.com> 1414085524 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1414085524 +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':