commit | 62fbfcd9ee86f8e2ee5d7083a6e9f5857bbbe6d9 | [log] [tgz] |
---|---|---|
author | Adam Lesinski <adamlesinski@google.com> | Mon Jul 27 20:51:03 2015 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Mon Jul 27 20:51:03 2015 +0000 |
tree | 483cebae0395fc79a33e47af956ec503b8176714 | |
parent | c2c611c4e5024bc9405cae4c9ffe9d72599f9751 [diff] | |
parent | d7f4a078791c983c89a4ee90b700bd4951627b8e [diff] |
am d7f4a078: am 48a90091: am fc28d6fc: Merge "BatteryStats: Prevent BatteryService from blocking" into mnc-dev * commit 'd7f4a078791c983c89a4ee90b700bd4951627b8e': BatteryStats: Prevent BatteryService from blocking