tree 7e75a5d544086699cfc6e85573e43ab1aecb7a2b
parent 22fac49a7be4e51de31287156885aa76a568c979
parent a50f43e0028ec174827e73d1e45666b8e694808f
author Adam Lesinski <adamlesinski@google.com> 1437508464 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1437508464 +0000

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