diff options
| author | Todd Kennedy <toddke@google.com> | 2015-08-27 20:13:48 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-08-27 20:13:48 +0000 |
| commit | 208f4812aebb34e0f3f828f975af8a8ec344107e (patch) | |
| tree | acd3e38539512eb037d74a6af7719b655d80b613 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | ee4056fd8a8770c3918366b7d0d86064e33b9e0f (diff) | |
| parent | fbb31b4a9c40c1cec6a7e5310784b02aeb36d3ed (diff) | |
am fbb31b4a: am 635c9915: (-s ours) am 5983ae7b: Merge "Allow extra slop in battery stats" into mnc-dev
* commit 'fbb31b4a9c40c1cec6a7e5310784b02aeb36d3ed':
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions