diff options
| author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-11-09 23:45:00 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-11-09 23:45:00 +0000 |
| commit | 42abb72e64f7a244d6436f91da8f4be55da8348c (patch) | |
| tree | c0c1434efac7994e39152c293e0ac65ab075af9d /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 2994515320d1c45f122a85ba47a7a7eb38c4d4a5 (diff) | |
| parent | 3134d7bc86e44b5d5b4d258ba96b8543ab879167 (diff) | |
[automerger skipped] Merge changes from topic "am-172fa15a4900438f87529bf46598ea73" into rvc-qpr-dev-plus-aosp am: 3134d7bc86 -s ours
am skip reason: Change-Id If3b420067b4d7111dcf67ae6f98e42176158b679 with SHA-1 dd6911cd57 is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12987876
Change-Id: I2b24347253d7757911832f630753df83482c38ab
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions