OSDN Git Service

Merge "Duplicate ambient display setting in battery settings." into oc-dr1-dev am...
authorAndrew Sapperstein <asapperstein@google.com>
Fri, 7 Jul 2017 22:51:12 +0000 (22:51 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 7 Jul 2017 22:51:12 +0000 (22:51 +0000)
am: 0d2b782c28  -s ours

Change-Id: I9ec3623ddcf18bfd8a321072c9103d6988b656d9


Trivial merge