OSDN Git Service

am 56a3106a: am fe6f2bca: am 7165f8f3: Merge "Accounting for background padding when...
authorWinson Chung <winsonc@google.com>
Fri, 14 Feb 2014 20:36:25 +0000 (20:36 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 14 Feb 2014 20:36:25 +0000 (20:36 +0000)
* commit '56a3106a4659644fe8c324e4333588f6580db8cd':


Trivial merge