diff options
author | TreeHugger Robot <treehugger-gerrit@google.com> | 2020-06-28 06:19:33 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-06-28 06:19:33 +0000 |
commit | 94833d6faa5f79897ffadc15e5d421272ef2c9bb (patch) | |
tree | 5d5e2a3632f249691a52892daa1d1ca579e8628a /tools/aapt2/java/JavaClassGenerator_test.cpp | |
parent | 8ea05523fae473aaeedbb6043eb743b2653ac6dc (diff) | |
parent | 1cfde1102268ae7f88f71513150f1cf8b07bbba2 (diff) |
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 8d737ec862 -s ours am: 1cfde11022 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12014871
Change-Id: Ic52a1152a6e85a0a5d25d3b4613890d8a9f2e496
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions