diff options
| author | Lorenzo Colitti <lorenzo@google.com> | 2019-06-03 21:38:02 -0700 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2019-06-03 21:38:02 -0700 |
| commit | 10cc610365c368e62e78b2145c4d4b61a37bf056 (patch) | |
| tree | 580b89e718170903ba9035ddd55dd2f55ea85557 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | db79569d13d93b17964776be7d239a74cc8683eb (diff) | |
| parent | de7e778057277a04fd7364571edf7c047f57fd41 (diff) | |
[automerger skipped] Merge "Revert "[DO NOT MERGE] Handle config override via settings correctly"" into qt-dev am: f61e5f2410 am: ddc32a5239
am: de7e778057 -s ours
am skip reason: subject contains skip directive
Change-Id: I42af1ce6b572304180d03685ca5f04b536f85ebe
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions