summaryrefslogtreecommitdiffstats
path: root/packages/SettingsLib/src
diff options
context:
space:
mode:
authorAdam Lesinski <adamlesinski@google.com>2015-07-09 01:31:20 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-07-09 01:31:20 +0000
commit1549adb4eaef28ef41ebd063df1e339de035e19d (patch)
tree03fa872bceb75093cc62b812672829150a1656d8 /packages/SettingsLib/src
parent7649e156ca61f1d72a9fa0a2a2120f49a61fee2f (diff)
parent7fb1655a891de275ab8a752294c42b9c13352af6 (diff)
downloadframeworks_base-1549adb4eaef28ef41ebd063df1e339de035e19d.zip
frameworks_base-1549adb4eaef28ef41ebd063df1e339de035e19d.tar.gz
frameworks_base-1549adb4eaef28ef41ebd063df1e339de035e19d.tar.bz2
am 7fb1655a: Merge "BatteryStats: Fail gracefully on corrupt battery stats" into mnc-dev
* commit '7fb1655a891de275ab8a752294c42b9c13352af6': BatteryStats: Fail gracefully on corrupt battery stats
Diffstat (limited to 'packages/SettingsLib/src')
0 files changed, 0 insertions, 0 deletions