OSDN Git Service

Merge "Hide wifi and bt in battery settings" into oc-dev am: 05777a7918 am: 9d0d6e4fcc
authorjackqdyulei <jackqdyulei@google.com>
Tue, 20 Jun 2017 23:29:53 +0000 (23:29 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 20 Jun 2017 23:29:53 +0000 (23:29 +0000)
am: 4b5a6a5284

Change-Id: Ieff7f23d06a16ff225cea8bebc31c6b2e0d8ee97


Trivial merge