OSDN Git Service

Merge "Duplicate ambient display setting in battery settings." into oc-dr1-dev
authorAndrew Sapperstein <asapperstein@google.com>
Fri, 7 Jul 2017 22:48:45 +0000 (22:48 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 7 Jul 2017 22:48:45 +0000 (22:48 +0000)
am: 604df3cc55

Change-Id: If9edeb0e771349bec9a0d3d23d8d9331a4ee13a6


Trivial merge