tree ebfad402e1268a8def1416e3ac2725a828a469bf
parent 5376e7a86fd9e87681584871b62c66cf31b5c262
parent 82a9bd2c03645494cb0965abc03a9a18823e07e5
author Winson Chung <winsonc@google.com> 1381278340 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1381278341 +0000

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