diff options
| author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-06-29 09:07:00 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-06-29 09:07:00 +0000 |
| commit | c76d5b2132c02d65755eb6644421ad920e17d015 (patch) | |
| tree | 927ddc20a4f171f9cd6146a9b5cab54361bfa2d8 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | c80605e0ae76c32710b462e6c8464cab3aabe071 (diff) | |
| parent | a60c18f443bfd10af43fbe5d4dd939195423df12 (diff) | |
Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 64aef342c9 -s ours am: a957158cc7 -s ours" into rvc-d1-dev-plus-aosp am: a60c18f443 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12026906
Change-Id: Ib0a30c1963187d7b4a9b9fc58825655cdff93174
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions