diff options
| author | Aaron Huang <huangaaron@google.com> | 2021-04-06 15:26:50 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-04-06 15:26:50 +0000 |
| commit | e106440fb22aa920bb983353844de4f71a5a57bc (patch) | |
| tree | 5975eede919faf6e3ee7ca50300996c732fc7177 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 464c65e4b164bbf11b787234fdf89cb1db82a7c0 (diff) | |
| parent | c4a39c01ac188a9a6cef8f32eee91be059803100 (diff) | |
[automerger skipped] Merge changes I5ed1bc8b,Ie9e6af0e am: 834026197f am: 33fdb4a42a am: c4a39c01ac -s ours
am skip reason: skip tag Change-Id I5ed1bc8bc8bee5b0c795fd8577a2d64628998e51 with SHA-1 02fda9556d is already in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1645290
Change-Id: Id8ab6d21ab2ffab8932ceab53ddd1fdb8da8f800
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions