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