OSDN Git Service

Merge "Put the donut on a diet." into oc-dr1-dev am: 2cbe278ad4
authorDaniel Nishi <dhnishi@google.com>
Wed, 28 Jun 2017 21:07:26 +0000 (21:07 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 28 Jun 2017 21:07:26 +0000 (21:07 +0000)
am: 7cc286bac7

Change-Id: I7ff03385d589e1fd147f05cd417fbaba144a3e3c

1  2 
res/values/dimens.xml

Simple merge