tree ebfad402e1268a8def1416e3ac2725a828a469bf
parent 65cff6425e09a0217818c4d79c40bf1b2ec2286e
parent 7165f8f3700cb44f50a99c03b37d729cc7a78bb2
author Winson Chung <winsonc@google.com> 1381278538 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1381278538 -0700

am 7165f8f3: Merge "Accounting for background padding when drawing the bg. (Bug 10881814)" into jb-ub-now-indigo-rose

* commit '7165f8f3700cb44f50a99c03b37d729cc7a78bb2':
  Accounting for background padding when drawing the bg. (Bug 10881814)