| commit | d7f4a078791c983c89a4ee90b700bd4951627b8e | [log] [tgz] |
|---|---|---|
| author | Adam Lesinski <adamlesinski@google.com> | Mon Jul 27 20:33:37 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Jul 27 20:33:37 2015 +0000 |
| tree | e0a4a25bf4ebf285bd79cde800b1e1ea3ac40d97 | |
| parent | 13ad04e76be2fb34ffc9a039272a82636e215caa [diff] | |
| parent | 48a90091b1f50043f000929e35d9aae5e8c457e3 [diff] |
am 48a90091: am fc28d6fc: Merge "BatteryStats: Prevent BatteryService from blocking" into mnc-dev * commit '48a90091b1f50043f000929e35d9aae5e8c457e3': BatteryStats: Prevent BatteryService from blocking