tree e25dff5fd21097fa62b1a8a3e2525d349cc08d20
parent c83923c1d492447e2f726c493519dfc00c5e5f05
parent 56a3106a4659644fe8c324e4333588f6580db8cd
author Winson Chung <winsonc@google.com> 1392410185 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1392410185 +0000

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

* commit '56a3106a4659644fe8c324e4333588f6580db8cd':