diff options
author | TreeHugger Robot <treehugger-gerrit@google.com> | 2020-06-24 18:30:02 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-06-24 18:30:02 +0000 |
commit | 50c48df6a032b24b8c174550ae10a1efecd6a933 (patch) | |
tree | bd44bbbf8dd45b9b5810c6f270906850080efa3a /tools/aapt2/java/JavaClassGenerator_test.cpp | |
parent | bed1bda0a372dceeb1c56a6c91af26af53d8fc9e (diff) | |
parent | 5ae3087f8f6a97030ccc88df58df7155e2ee3c39 (diff) |
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-d1-dev am: 65baeccdd8 -s ours am: 296a06d4fb -s ours am: 5ae3087f8f -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11980785
Change-Id: I72a183d4679ff82c0662d945886fbdf15926eeed
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions