Commits
Adam Lesinski authored and Android Git Automerger committed 3a9537c75faM
am 97bb9d05: (-s ours) am fc28d6fc: Merge "BatteryStats: Prevent BatteryService from blocking" into mnc-dev * commit '97bb9d0546e8672e0467c838c4c374e86e071d09':
Showing diff to9549afba91f