From: jackqdyulei <jackqdyulei@google.com>
Date: Mon, 17 Apr 2017 22:00:25 +0000 (+0000)
Subject: Merge "Make battery status refresh in SettingsActivity" into oc-dev
X-Git-Tag: android-x86-8.1-r1~113^2~104
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=d5178f2bf0;p=android-x86%2Fpackages-apps-Settings.git

Merge "Make battery status refresh in SettingsActivity" into oc-dev
am: 3a156f5509

Change-Id: I4706f49e9f8cce14fd98da167a8d05b4ba4a4519
---

d5178f2bf0c0affc79d9673e9b0c9c8ba4ee4b8c