tree 10da860fcff71886af91d082e31f0e1917926848
parent 313f8642f639e348ae044b3e2ba09827db7946b7
parent 3d213d4fc3c286a2f603bf50f45bd44a3eccec9f
author Winson Chung <winsonc@google.com> 1414566228 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1414566228 +0000

am 3d213d4f: am 9e40582f: 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 '3d213d4fc3c286a2f603bf50f45bd44a3eccec9f':