OSDN Git Service

Merge "Remove duplicates between battery and display settings" into oc-dev
authorMatthew Fritze <mfritze@google.com>
Sat, 22 Apr 2017 00:59:40 +0000 (00:59 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Sat, 22 Apr 2017 00:59:40 +0000 (00:59 +0000)
am: 1c7e25d3b6

Change-Id: I1e824de321f7d8eeb9fbcefb22048af0ae5109be


Trivial merge