OSDN Git Service

Merge "Set advanced battery usage items as non-selectable" into oc-dev
authorAntony Sargent <asargent@google.com>
Fri, 9 Jun 2017 15:49:10 +0000 (15:49 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 9 Jun 2017 15:49:10 +0000 (15:49 +0000)
am: d77b699e60

Change-Id: Ib647c80d06ed0cda957759f0250277531ac46f13


Trivial merge