tree a2ed703c5116d2773c4de297aa4babaf4d7bf71a
parent ccfc9f71650279e832db6a633f027db68d48c17e
parent 5c502d71347b1b888c7e48d41b592fab1139f4ad
author Winson Chung <winsonc@google.com> 1392411733 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1392411733 +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':
  Modifying Workspace padding to account for Search Bar offsets. (Bug 11968598)