OSDN Git Service

Merge "Hide wifi and bt in battery settings" into oc-dev am: 05777a7918
authorjackqdyulei <jackqdyulei@google.com>
Tue, 20 Jun 2017 23:11:47 +0000 (23:11 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 20 Jun 2017 23:11:47 +0000 (23:11 +0000)
am: 7de9af3b8f

Change-Id: I7230df797ff3cc6435d9145527bc962a0df9deb3


Trivial merge