diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2020-07-18 08:04:58 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-07-18 08:04:58 +0000 |
| commit | 1c5b5d891ce3a30a5acfd1ef138ebd2fcb80bed2 (patch) | |
| tree | ac790e097d5d1c43ab2ff44f09a5fa48748c6c51 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 2c6359720a526bbb465308242a3fd079aa85d119 (diff) | |
| parent | 154033f56fb58563141166931fa4ccee695c24d9 (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: 154033f56f -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12184423
Change-Id: Ia1d7cd6985acda01cd431ae8d30c8f52f72a5393
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions