diff options
author | TreeHugger Robot <treehugger-gerrit@google.com> | 2020-06-10 21:31:52 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-06-10 21:31:52 +0000 |
commit | 0c5d9530a942be712ac0741f69d230b8be4c0463 (patch) | |
tree | 645238eaf8ab80c862592f60d6243515048b6448 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
parent | 6372d1a6f95a2e5593151b421a2e7e0d19470a07 (diff) | |
parent | c36033f80a625b28a0a70877f660720763cd5988 (diff) |
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 14d8e24fef -s ours am: c36033f80a -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11818445
Change-Id: I3232fe074d617efd126f3ec1b399c4b93d5c24f1
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions