diff options
| author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-06-05 23:48:54 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-06-05 23:48:54 +0000 |
| commit | 810d753b18d6e1d166954b23509228a399bda28f (patch) | |
| tree | 8ec08525b1cce5c6ff6c7cc0ab31e75de2e68ef5 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | a2ff340699741edbe3d1c0c1b020d3648071f9a0 (diff) | |
| parent | ee0600f446a209c95e746ea3d68558e7d10afb64 (diff) | |
Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 80e43d2ed7 -s ours am: 8a9211ecc5 -s ours" into rvc-d1-dev-plus-aosp am: 9a78c292c9 -s ours am: ee0600f446 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11759020
Change-Id: I67550882de0d0dadffb5b6819ebb3d85309ac04d
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions