commit | deabddb34ea60f1c1e29d88e0c39165d565a3f22 | [log] [tgz] |
---|---|---|
author | Adam Lesinski <adamlesinski@google.com> | Mon Jul 27 21:17:38 2015 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Mon Jul 27 21:17:38 2015 +0000 |
tree | 08011bead28d726d37ee7df97ba237728d117746 | |
parent | 4cfa238971fe97b0e5e3bbe5d456de93c6d31788 [diff] | |
parent | d07d8446dfb9f648a6027a7a35f34781eba51dcc [diff] |
am d07d8446: am 62fbfcd9: am d7f4a078: am 48a90091: am fc28d6fc: Merge "BatteryStats: Prevent BatteryService from blocking" into mnc-dev * commit 'd07d8446dfb9f648a6027a7a35f34781eba51dcc': BatteryStats: Prevent BatteryService from blocking