diff options
| author | Xin Li <delphij@google.com> | 2021-02-23 10:35:03 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-02-23 10:35:03 +0000 |
| commit | 5075d304ecbd375492935ac42bee1ced54056331 (patch) | |
| tree | e49d0bf8e567648e16ea4b30086b0036d062c6e1 /tools/aapt2/java/JavaClassGenerator.cpp | |
| parent | 990269dd07062edf09c1b3fa436a62e429452b60 (diff) | |
| parent | 6c90c4e50249041123508a8d5ee7141135ea8e3b (diff) | |
[automerger skipped] Merge ab/7061308 into stage. am: be473bf819 -s ours am: 6c90c4e502 -s ours
am skip reason: Change-Id I4bf82035631ccff6d5a6144d6d9b1d203b076851 with SHA-1 3078660c4e is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13657544
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I831ba618445a338cc57e0cdbff65e3c44aeaf93f
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator.cpp')
0 files changed, 0 insertions, 0 deletions