diff options
author | TreeHugger Robot <treehugger-gerrit@google.com> | 2020-06-27 18:42:56 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-06-27 18:42:56 +0000 |
commit | 903255d4b22c562ef83f7e8642e76f2573d26c7b (patch) | |
tree | ee3804b43bb20a0cbbde63169c77ea906bab2448 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
parent | 895de45a1966f7bef753a227de2d35619a338738 (diff) | |
parent | 4052efd71e4523fef4227de57b3da426e89f3d70 (diff) |
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-d1-dev am: ef99fbd9ce -s ours am: d0fea78ef4 -s ours am: 4052efd71e -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12018922
Change-Id: I2596e91687206b6c9ce56fd01c686036232b1175
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions