tree cba62d0d64153aa2169651696bc238591341d679
parent 272bd576d1118699ca047407afc62bbb8aba8aa8
parent 9e40582f7daa55814a0d74061ac7a404985ad1ab
author Winson Chung <winsonc@google.com> 1414085302 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1414085302 +0000

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 '9e40582f7daa55814a0d74061ac7a404985ad1ab':