tree cba62d0d64153aa2169651696bc238591341d679
parent 5b278a722612541c84684607b6658b063dd793af
parent 5c502d71347b1b888c7e48d41b592fab1139f4ad
author Winson Chung <winsonc@google.com> 1414085513 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1414085513 +0000

am 5c502d71: am 1cfabb7f: am ab84b8b4: am 1a5adf4f: Merge "Modifying Workspace padding to account for Search Bar offsets. (Bug 11968598)" into jb-ub-now-jolly-elf

* commit '5c502d71347b1b888c7e48d41b592fab1139f4ad':