diff options
author | TreeHugger Robot <treehugger-gerrit@google.com> | 2020-06-23 18:58:53 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-06-23 18:58:53 +0000 |
commit | 90e68edc1d3875e0c52c71a433df920b096da326 (patch) | |
tree | 93c73b4da8d78cd3f150cb8fc10befb4fb5aaa64 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
parent | d5de8a14e7eaa623d617303333f3cb9b3938a467 (diff) | |
parent | 91390fe5b4d99a980a85f4deaa018ba457c09f93 (diff) |
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: f8c312b928 -s ours am: 89dc28eca4 -s ours am: 6228268073 -s ours am: 91390fe5b4 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11964771
Change-Id: I5b89830eb98aa7d08ce1c6c7e8b94281f8faf165
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions