diff options
| author | Xin Li <delphij@google.com> | 2020-12-10 03:47:00 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-12-10 03:47:00 +0000 |
| commit | 6b2e6ab2f554148e15b43c8d1224ced0ee8352bd (patch) | |
| tree | 4f74b1a39c1594ae116dd71236f0e18b4cb61f75 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 353274f15d32a24aa6b05fd1a495c067ffe573e2 (diff) | |
| parent | 54ec331515b2123c680393572eaf02d167a7d3da (diff) | |
[automerger skipped] Merge "DO NOT MERGE - Merge Android R QPR1" am: 201f2cf86d -s ours am: 54ec331515 -s ours
am skip reason: Change-Id Ib81ba3288a986546bc570c3759c55d026add591a with SHA-1 3cfbcbee16 is in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1520888
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ic11fc264d783e729729854a5f7f7b03d38d43e3e
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions