| commit | 208d273edcaa59470fa1a83d96b0b3cd036dbbf1 | [log] [tgz] |
|---|---|---|
| author | Adam Lesinski <adamlesinski@google.com> | Tue Jul 21 20:24:36 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Jul 21 20:24:36 2015 +0000 |
| tree | 55cf280a7d36b9196c428d23d9e42f0ec57e9239 | |
| parent | 75fc69addd791738ba6162ecefbba93c5329f502 [diff] | |
| parent | e1cd38e9298f0a62418e95adee64e5f2d7e36297 [diff] |
am e1cd38e9: am ca34b184: am a50f43e0: am 23e19066: Merge "BatteryStats: Read /proc/wakelocks first before trying /d/wakeup_sources" into mnc-dev * commit 'e1cd38e9298f0a62418e95adee64e5f2d7e36297': BatteryStats: Read /proc/wakelocks first before trying /d/wakeup_sources