diff options
| author | Todd Kennedy <toddke@google.com> | 2015-08-26 00:34:24 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-08-26 00:34:24 +0000 |
| commit | 635c9915e64c69bdf9b5d1a9923b7085d146ba64 (patch) | |
| tree | 5abff44ae72b2c8014b0ae3c09dc41bc698e1d69 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 555f91db7cb364714b1f731a85242adc98b868c3 (diff) | |
| parent | 5983ae7b98bbe16b8a0a5ffe9203baa1ed58a8fb (diff) | |
am 5983ae7b: Merge "Allow extra slop in battery stats" into mnc-dev
* commit '5983ae7b98bbe16b8a0a5ffe9203baa1ed58a8fb':
Allow extra slop in battery stats
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions