diff options
author | TreeHugger Robot <treehugger-gerrit@google.com> | 2020-06-21 18:21:58 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-06-21 18:21:58 +0000 |
commit | 099e2ee61451b3f3fbbc99a5dca74689235c016f (patch) | |
tree | 58fbabf65039e97889bc8fb11492019a3e8a696f /tools/aapt2/java/JavaClassGenerator_test.cpp | |
parent | 981c5f86c564bc986f1aaf6ac42caf6a6d93b8f5 (diff) | |
parent | c47366fe16933ca792cc68697e8a64c1dd9cdd2d (diff) |
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 3b1822849c -s ours am: 87d0d2ef75 -s ours am: c47366fe16 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11937075
Change-Id: I981c58d2ba9a03f2518b072bc844161da1f12a4c
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions