tree 10da860fcff71886af91d082e31f0e1917926848
parent 2d8207db2e773d58087388e14e90f00948edae35
parent 3be79574b8d0312a12fe5cb36303fac5d692723b
author Winson Chung <winsonc@google.com> 1414566383 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1414566383 +0000

am 3be79574: 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 '3be79574b8d0312a12fe5cb36303fac5d692723b':