am 23e19066: Merge "BatteryStats: Read /proc/wakelocks first before trying...
am 23e19066: Merge "BatteryStats: Read /proc/wakelocks first before trying /d/wakeup_sources" into mnc-dev
* commit '23e19066':
BatteryStats: Read /proc/wakelocks first before trying /d/wakeup_sources