tree 4e7ec699006b78d116024621f74302c250c1cfaa
parent 084b400936571f0ca2596ca71f8b8adaff6624a0
parent e6e924ec725f978078cfbcaa4c6022ffb99b4bd7
author Winson Chung <winsonc@google.com> 1392411091 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1392411091 +0000

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

* commit 'e6e924ec725f978078cfbcaa4c6022ffb99b4bd7':