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