OSDN Git Service

Merge "Show wifi and bluetooth item in battery settings" into oc-dev am: 21d2403c67
authorjackqdyulei <jackqdyulei@google.com>
Thu, 18 May 2017 19:35:56 +0000 (19:35 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 18 May 2017 19:35:56 +0000 (19:35 +0000)
am: 972763ee50

Change-Id: Ic54ae913ec5f9418f81ad15437fbaca8b96fad15


Trivial merge