OSDN Git Service

Merge "Restore padding." into nyc-mr1-dev
authorJulia Reynolds <juliacr@google.com>
Mon, 8 Aug 2016 20:05:52 +0000 (20:05 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Mon, 8 Aug 2016 20:05:53 +0000 (20:05 +0000)

Trivial merge