diff options
| author | Chris Tate <ctate@android.com> | 2020-03-06 03:54:52 +0000 |
|---|---|---|
| committer | Chris Tate <ctate@android.com> | 2020-03-06 03:54:52 +0000 |
| commit | a9bb977a7158b010920228f287b07e5023634951 (patch) | |
| tree | fd8278188d793424b8d28f21cc5e35347b2e3b3e /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | b79affb6d9a26625a935aac16a874ca109b551c2 (diff) | |
Revert "[automerger skipped] Merge "DO NOT MERGE - Kill apps out..."
Revert "[automerger skipped] Merge "DO NOT MERGE - Add test of f..."
Revert "DO NOT MERGE - Track framework changes to crashApplicati..."
Revert submission 10556828-am-2e2e7004e4cb4ef8b776d65e9ffe33f3
Reason for revert: Should never have automerged downstream from qt-dev; the entire topic should have been skipped.
Reverted Changes:
I241d8d8da:DO NOT MERGE - Track framework changes to crashApp...
Ib1a5695f9:[automerger skipped] Merge "DO NOT MERGE - Add tes...
I3e6eb3f5c:[automerger skipped] Merge "DO NOT MERGE - Kill ap...
Ibe4652916:DO NOT MERGE - Track framework changes to crashApp...
Change-Id: I4d73e88c87891af1540dfd95c9e9bc3c39b11531
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions