Commits
Adam Lesinski authored and Android Git Automerger committed 60365f4934eM
am 88b65478: (-s ours) am 60261137: Merge "BatteryStats: Compensate for accuracy issues when reporting WiFi energy data issues with Slog.wtf" into mnc-dev * commit '88b654789811a62c5ecd0966ba9d19ebc169e97d':
Showing diff to88b65478981