diff options
author | TreeHugger Robot <treehugger-gerrit@google.com> | 2020-06-18 18:27:08 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-06-18 18:27:08 +0000 |
commit | 2e00f4631342672f88ce8888fd3450c036aa18fa (patch) | |
tree | f6e26618ccadc5bd488d26de9acced7fa9f4f97e /tools/aapt2/java/JavaClassGenerator_test.cpp | |
parent | 83dfffc5d7c87a85c52fed80c42d4ce1812f5f4d (diff) | |
parent | f6e6f1e4ea369eb56ee1c96781b825f896b8b7cc (diff) |
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 776cb394b6 -s ours am: 766a6861ca -s ours am: 0d179cb5fe -s ours am: f6e6f1e4ea -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11894373
Change-Id: Iab89d8d640e705ff5ad7eb772591737ce3d16d56
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions