diff options
author | TreeHugger Robot <treehugger-gerrit@google.com> | 2020-07-05 21:12:55 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-07-05 21:12:55 +0000 |
commit | 4367680f479f5c20b7a3a81777ca01b029efb98f (patch) | |
tree | 4d8fdf6881f2c44b178974a187424116403994c3 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
parent | fe6079e08319fee7b6d9540bd463cf028105dfdd (diff) | |
parent | 2acf4490cad16a8b9035e161b711717b170e5e30 (diff) |
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-qpr1-dev am: dc862269a7 -s ours am: 9348f97202 -s ours am: 2acf4490ca -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12079852
Change-Id: I3ef927a75f1f311608a99ca398348a07c14f27eb
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions