diff options
author | TreeHugger Robot <treehugger-gerrit@google.com> | 2020-07-06 14:22:33 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-07-06 14:22:33 +0000 |
commit | d4850bb97486374b6de87913c11884a0bd261ac8 (patch) | |
tree | 4dc1880b8fa57b28ce990067e0049c0f065dcc8c /tools/aapt2/java/JavaClassGenerator_test.cpp | |
parent | d289316fbfdffbef4a37365cdadcdf4ff4224a47 (diff) | |
parent | 4f2fb706520c978de59d87c65176ad1e2ccbe16a (diff) |
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-qpr1-dev am: 0f192f44d7 -s ours am: b30a1434b9 -s ours am: 4f2fb70652 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12086504
Change-Id: I825716e67337942167c7f07347fed38fcf355393
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions