tree bcd2829545cdd9bb61ce58adbc578a9f111ad8a8
parent 6391a8d44684f64d9b803f7994f26935a563a1ee
parent 23e19066de2caf1db1fa0759ac49a1118b59f7a5
author Adam Lesinski <adamlesinski@google.com> 1437507624 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1437507624 +0000

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