OSDN Git Service

Merge "Set Theme.DeviceDefault.Settings's colorEdgeEffect" into oc-dev
authorAndrew Sapperstein <asapperstein@google.com>
Fri, 28 Apr 2017 20:06:21 +0000 (20:06 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 28 Apr 2017 20:06:21 +0000 (20:06 +0000)
am: 2233ba3eb5

Change-Id: I578a447f88ee09da77f4974bce1a23e2c93ed40f


Trivial merge