commit | a50f43e0028ec174827e73d1e45666b8e694808f | [log] [tgz] |
---|---|---|
author | Adam Lesinski <adamlesinski@google.com> | Tue Jul 21 19:40:24 2015 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Tue Jul 21 19:40:24 2015 +0000 |
tree | bcd2829545cdd9bb61ce58adbc578a9f111ad8a8 | |
parent | 6391a8d44684f64d9b803f7994f26935a563a1ee [diff] | |
parent | 23e19066de2caf1db1fa0759ac49a1118b59f7a5 [diff] |
am 23e19066: Merge "BatteryStats: Read /proc/wakelocks first before trying /d/wakeup_sources" into mnc-dev * commit '23e19066de2caf1db1fa0759ac49a1118b59f7a5': BatteryStats: Read /proc/wakelocks first before trying /d/wakeup_sources