Commits
Todd Kennedy authored and Android Git Automerger committed 208f4812aebM
am fbb31b4a: am 635c9915: (-s ours) am 5983ae7b: Merge "Allow extra slop in battery stats" into mnc-dev * commit 'fbb31b4a9c40c1cec6a7e5310784b02aeb36d3ed':
Showing diff toee4056fd8a8