tree 141469b092371020a1517ead2449e4b8f06a3cac
parent 3ed4a4dd3dc77295579e8eaece294c30cf6831ef
parent 1a5adf4f4cb30114fc0e508651b2833dd15674d0
author Winson Chung <winsonc@google.com> 1386083241 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1386083241 -0800

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

* commit '1a5adf4f4cb30114fc0e508651b2833dd15674d0':
  Modifying Workspace padding to account for Search Bar offsets. (Bug 11968598)