| commit | 9986350d66b6106cabe8c017455561f52a727f2c | [log] [tgz] |
|---|---|---|
| author | Adam Lesinski <adamlesinski@google.com> | Tue Jun 30 21:40:24 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Jun 30 21:40:24 2015 +0000 |
| tree | 71ff3bb5447c1b0d9122ac8de6bcf7c6ac3a9f59 | |
| parent | cd1fc008006eadcd20de66346741fa4424ab2c3e [diff] | |
| parent | 36eadf9c1d78b047d9e43bf28fe2de417cc1fce5 [diff] |
am 36eadf9c: am 32ddd534: Merge "BatteryStats: Account for remaining OS wakelock time at the end of processing all apps" into mnc-dev * commit '36eadf9c1d78b047d9e43bf28fe2de417cc1fce5': BatteryStats: Account for remaining OS wakelock time at the end of processing all apps