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