diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2020-07-06 14:22:13 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-07-06 14:22:13 +0000 |
| commit | f4ca0c379ba38ae7936322a74defbc74d819292f (patch) | |
| tree | 4dc1880b8fa57b28ce990067e0049c0f065dcc8c /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 2fb1cd38c53bb0ec911332ae5ccf81a9a26177d4 (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: I1b32a18b24c5a781a002dd031cc941f4bd136745
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions