diff options
author | TreeHugger Robot <treehugger-gerrit@google.com> | 2020-06-27 18:32:43 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-06-27 18:32:43 +0000 |
commit | 05f43b76e2a53c517c91f00a3e6fc8e23edfc1d1 (patch) | |
tree | 0086bc7f9cfd7055094342ae341610753985d4a1 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
parent | 4052efd71e4523fef4227de57b3da426e89f3d70 (diff) | |
parent | 781be73a9b121dc2dfe08a4e624ae2c8118b0d36 (diff) |
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-d1-dev am: 588dae0862 -s ours am: 781be73a9b -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12014704
Change-Id: I15d21c97ef0f8dbfc63366c70d6b3c7e7153346d
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions