tree ebfad402e1268a8def1416e3ac2725a828a469bf
parent f4421dceb3df1dcc19f75c7e8eddea3b8aa6ca7b
parent fe6f2bca05cdc10bf503736963a3ae1daf13da9e
author Winson Chung <winsonc@google.com> 1381278709 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1381278709 -0700

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

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