diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2020-07-18 07:44:37 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-07-18 07:44:37 +0000 |
| commit | 154033f56fb58563141166931fa4ccee695c24d9 (patch) | |
| tree | a82c7f97cfa991ca4eb0b8468776b130069702ad /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | d89013984601520b9f209b5c17ccd207a358a1a5 (diff) | |
| parent | 8cb95a922476c8c902d8d62dfea92e8c5bd88b80 (diff) | |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-dev am: 851960cdd1 -s ours am: cb2bff1f62 -s ours am: 8cb95a9224 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12184423
Change-Id: I0525a107a1b645780a88937cee4059cb82a46e8e
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions