OSDN Git Service

Merge "Restore padding." into nyc-mr1-dev
authorJulia Reynolds <juliacr@google.com>
Mon, 8 Aug 2016 20:12:30 +0000 (20:12 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 8 Aug 2016 20:12:30 +0000 (20:12 +0000)
am: 67abc837af

Change-Id: Ib58f6c77e6211c73df7190c02483352fb4deb56a


Trivial merge