diff options
| author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-03-06 16:18:57 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-03-06 16:18:57 +0000 |
| commit | 2fea0b147f8d39250a725b754b71928c356167f3 (patch) | |
| tree | 6413b407d248e9614d0e2119732cec686313fbf2 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 9e37e79bf37af7467fd38901ecee5396a7fb2de4 (diff) | |
| parent | f4f30312fa32a53d1c72503433901dfab9049237 (diff) | |
Merge "Revert "[automerger skipped] Merge "DO NOT MERGE - Kill apps out..."" into qt-qpr1-dev am: f4f30312fa -s ours
am skip reason: subject contains skip directive
Change-Id: Ie22def6bf2c3953aac5c91b6ad79c6f6eecdad01
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions