diff options
| author | Orion Hodson <oth@google.com> | 2020-06-25 08:50:30 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-06-25 08:50:30 +0000 |
| commit | 7c79b15a566b9fd8cf49d88ea73427a025e85113 (patch) | |
| tree | 4a499ff9cb51c293c96c85d5bf4a677084a9ee3c /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 1664e8b1510806e883fba7a475d64d067c518c4d (diff) | |
| parent | d4ff1cdd718cc2697b21434ff244ada10363726d (diff) | |
[automerger skipped] Merge changes from topic "lnh-platform-split" am: 47640f51c4 am: cb98f2f1a0 -s ours am: 9146ac941b -s ours am: d4ff1cdd71 -s ours
am skip reason: Change-Id I7af128f42ae89a77a8e3fb113ea533331153c535 with SHA-1 864d304156 is in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1348764
Change-Id: I3f024bdb06de2b019e136e9542c11b0067c604be
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions