| commit | d07d8446dfb9f648a6027a7a35f34781eba51dcc | [log] [tgz] |
|---|---|---|
| author | Adam Lesinski <adamlesinski@google.com> | Mon Jul 27 21:03:35 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Jul 27 21:03:35 2015 +0000 |
| tree | 05dbe5a664ef793bd1105bb86883cdff56f38eaa | |
| parent | 98cbe497f58aaf8ab8bc106d79a3aed567d9b58b [diff] | |
| parent | 62fbfcd9ee86f8e2ee5d7083a6e9f5857bbbe6d9 [diff] |
am 62fbfcd9: am d7f4a078: am 48a90091: am fc28d6fc: Merge "BatteryStats: Prevent BatteryService from blocking" into mnc-dev * commit '62fbfcd9ee86f8e2ee5d7083a6e9f5857bbbe6d9': BatteryStats: Prevent BatteryService from blocking