OSDN Git Service

Merge "Make "Battery usage" accessible at any time" into oc-dev am: a935b3c030
authorjackqdyulei <jackqdyulei@google.com>
Wed, 24 May 2017 19:31:14 +0000 (19:31 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 24 May 2017 19:31:14 +0000 (19:31 +0000)
commit3b0da6d4786b3af277068ae114864cd240013264
tree6aed72e0ed0190b08c9f3a18a4656fadf4cb5ff1
parentba7230e3be23b8dfd104921d488472d1b9fbef05
parent4516644b46fd584d6294e203e65a64e3392f2793
Merge "Make "Battery usage" accessible at any time" into oc-dev am: a935b3c030
am: 4516644b46  -s ours

Change-Id: Id2468f81d36e890897d60b6eda3f50c5c162203c