diff options
| author | Junyu Lai <junyulai@google.com> | 2021-05-03 14:38:47 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-05-03 14:38:47 +0000 |
| commit | 94592d369e325eafbcc1a3d242bd7475f4bf2528 (patch) | |
| tree | 15b40ec8dc512428e7b635f5263103bafc4171b7 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | c73048d6aecee9ff603701c6122e3c6cd93c18c1 (diff) | |
| parent | d05921c66165bab013b4ff76880f99707095e378 (diff) | |
[automerger skipped] Merge changes I6c486303,I073934f3,I6ee66149,Ibbb4325c into mainline-prod am: d05921c661 -s ours
am skip reason: Merged-In I6c4863030c36328db571294fd12a40e59864def5 with SHA-1 ff05ee0fdb is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14277733
Change-Id: If3ff5c4a714f3c4947a158a2b4e921c8bbc15eee
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions