diff options
author | TreeHugger Robot <treehugger-gerrit@google.com> | 2020-07-06 14:22:37 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-07-06 14:22:37 +0000 |
commit | d24d4a24d727c672ae567f593491f1922b099494 (patch) | |
tree | 9a07c1d4a636852b7bc18027a8836e42b41d1eae /tools/aapt2/java/JavaClassGenerator_test.cpp | |
parent | 5fa13fcbf307660d85f8dbc3b1e9045f3b6aca37 (diff) | |
parent | 03dea08a2b31a8835a53990f24bdbb7f06b99ea5 (diff) |
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-qpr1-dev am: ac0b376dde -s ours am: 5bc71ea527 -s ours am: 03dea08a2b -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12086502
Change-Id: I74f2404b9fc900985bc5dc547de8ca49b8445098
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions