diff options
author | TreeHugger Robot <treehugger-gerrit@google.com> | 2020-06-18 20:39:56 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-06-18 20:39:56 +0000 |
commit | fdbc6b7117ebb4257e9ef2591c8a03a76148d67b (patch) | |
tree | dbe9cf22978a71ecb11801e1113017c38cae49f7 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
parent | ac0fb6ab39e23298b3dee5e68deef669b4f5330a (diff) | |
parent | 4f8acf92ec0bf175f5df778ed2ae771385e9e103 (diff) |
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 3c26551d2b -s ours am: 3adc5af9fd -s ours am: 0e8b14e6e5 -s ours am: 4f8acf92ec -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11916186
Change-Id: Ieca9c56497f7e3b8b4c47505e027597d547ebb67
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions