diff options
author | TreeHugger Robot <treehugger-gerrit@google.com> | 2020-06-21 18:09:34 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-06-21 18:09:34 +0000 |
commit | 8d62c50d89e4d85e5ae5247edd509e6167c0c6c2 (patch) | |
tree | fb028513def85670d7a39673f116a83d26588f41 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
parent | cf87fdf57ed358b0b440c42235f4a6d5f4b41429 (diff) | |
parent | bd52820306cd29f1345c5f58fc1c1f394aa6cb4a (diff) |
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 45b2fcf55d -s ours am: bd52820306 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11937072
Change-Id: I98b9bdbfea99c325d4e1308865f798cfe9cf447d
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions