diff options
| author | Orion Hodson <oth@google.com> | 2020-06-25 08:13:32 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-06-25 08:13:32 +0000 |
| commit | 9146ac941b54bb3431d4ec6654f97ed9ed47a747 (patch) | |
| tree | 7816de822558904c05e74b5c1016580375760bdc /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 5a9cf6d1f3a3890ff7eb61bb0635283675f925d1 (diff) | |
| parent | cb98f2f1a00cf05e326da497028d3eca307f696e (diff) | |
[automerger skipped] Merge changes from topic "lnh-platform-split" am: 47640f51c4 am: cb98f2f1a0 -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: I3bb4fbb8c5c7df3f43bb69e1228848540e1249f9
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions