diff options
| author | Patrick Rohr <prohr@google.com> | 2021-01-12 21:02:39 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-01-12 21:02:39 +0000 |
| commit | 5981ad250417adde3f82dab9171297b040ee12eb (patch) | |
| tree | a03a798f58cbd753e183bf2dc3184fa707705bbd /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 471a30a49b00842df45d256a86d6a47cc3dbddb3 (diff) | |
| parent | c4ad204556f2aee7f80372b64dcde5988cefc865 (diff) | |
[automerger skipped] Merge changes I0731fa84,Id31a60ad am: 1ab1849ab2 am: 6e05084c6a am: c4ad204556 -s ours
am skip reason: Change-Id I0731fa842c69683953baaf9ec3a9a03454f4c607 with SHA-1 5197d1bd33 is in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1545865
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I219f52d87432d5f24d7ed79d04fda2b5cac56a8c
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions