OSDN Git Service

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

Change-Id: I0c081383954104ab3d22439dffb3a6aefd6efe3a


Trivial merge