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