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:05:34 +0000 (23:05 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 20 Jun 2017 23:05:34 +0000 (23:05 +0000)
am: 9d0d6e4fcc

Change-Id: If6960f114f3d42e95061a8e832f9b99695c2bd7f


Trivial merge