summaryrefslogtreecommitdiffstats
path: root/api
diff options
context:
space:
mode:
authorAdam Lesinski <adamlesinski@google.com>2015-07-27 20:01:34 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2015-07-27 20:01:34 +0000
commitfc28d6fc9dec30e4cd98cc894d596f7df986f5b9 (patch)
treeaa4c375791219f3817aef4e4ff2e257d1ff7eed3 /api
parentf68e0236a67a8d6f8ec167df0daf332221149b51 (diff)
parentd7616ef73c48a1e5d6ba0e36fc6e85b007832d25 (diff)
downloadframeworks_base-fc28d6fc9dec30e4cd98cc894d596f7df986f5b9.zip
frameworks_base-fc28d6fc9dec30e4cd98cc894d596f7df986f5b9.tar.gz
frameworks_base-fc28d6fc9dec30e4cd98cc894d596f7df986f5b9.tar.bz2
Merge "BatteryStats: Prevent BatteryService from blocking" into mnc-dev
Diffstat (limited to 'api')
0 files changed, 0 insertions, 0 deletions