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