| commit | fbb31b4a9c40c1cec6a7e5310784b02aeb36d3ed | [log] [tgz] |
|---|---|---|
| author | Todd Kennedy <toddke@google.com> | Thu Aug 27 10:44:33 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Aug 27 10:44:33 2015 +0000 |
| tree | 715d547d2502de8d04de0ec12233b3183ce62c99 | |
| parent | 251693142db59cd72cfedcadc28cbc96d88dc7b5 [diff] | |
| parent | 635c9915e64c69bdf9b5d1a9923b7085d146ba64 [diff] |
am 635c9915: (-s ours) am 5983ae7b: Merge "Allow extra slop in battery stats" into mnc-dev * commit '635c9915e64c69bdf9b5d1a9923b7085d146ba64':