diff options
| author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-04-13 18:52:34 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-04-13 18:52:34 +0000 |
| commit | 025e7c2d268ff563e0e3c5dc598d5340639abbbf (patch) | |
| tree | 81de5e2f1abb31a58350f3945e0e743c5a1df310 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 85cd22e0fb9f73b014c0652ca877e8e297327f90 (diff) | |
| parent | 51bbfddd7d83908b626c76b33a7643ce6260f8c5 (diff) | |
[automerger skipped] Merge "Merge "Update references incompatibilies files" am: 1ea3057847" into stage-aosp-master am: 23c55673c6 am: 51bbfddd7d -s ours
am skip reason: skip tag Change-Id I94e2ecd2075a577c5362293622ce5be5167cd91a with SHA-1 7f3393d849 is already in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1671839
Change-Id: I36c218a5a6ad39ca07e261bf6beac78361e7b523
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions