diff options
| author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-01-06 05:07:34 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-01-06 05:07:34 +0000 |
| commit | a5e51cb86a98869c5c40c83ae5a12b6755cc3171 (patch) | |
| tree | 82e73345328296cc1b55b63ab749864212650950 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 7269b96458aac0c0a2283ca27a39f5149eb7aa56 (diff) | |
| parent | 5625f26cdc368d0deea716a065cd55352eddd740 (diff) | |
[automerger skipped] Merge changes from topic "am-48fce8054ea84f449c45918497754b47" into stage-aosp-master am: 5625f26cdc -s ours
am skip reason: Change-Id Ife05ba75a3f23d0c18b3aa068881b6646dee6db5 with SHA-1 d8e09b9744 is in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1535564
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I9fdf350c94e0009807b7ce600c77622e0250148d
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions