commit | 48a90091b1f50043f000929e35d9aae5e8c457e3 | [log] [tgz] |
---|---|---|
author | Adam Lesinski <adamlesinski@google.com> | Mon Jul 27 20:21:20 2015 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Mon Jul 27 20:21:20 2015 +0000 |
tree | 43a7d270cf3cec7cc980f73cc74f8ac40415b8a9 | |
parent | 3df17a6d01507de4690601f948ec776f48ccba87 [diff] | |
parent | fc28d6fc9dec30e4cd98cc894d596f7df986f5b9 [diff] |
am fc28d6fc: Merge "BatteryStats: Prevent BatteryService from blocking" into mnc-dev * commit 'fc28d6fc9dec30e4cd98cc894d596f7df986f5b9': BatteryStats: Prevent BatteryService from blocking