diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2020-07-06 14:35:57 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-07-06 14:35:57 +0000 |
| commit | 0832e15d77656e07acdf5e7565911129b59a192f (patch) | |
| tree | 14c2f9a0d1746438eb6ef897297c6b0c8e48e4a9 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 77c19165282c0ea873d19656c1e4dbae853fcba8 (diff) | |
| parent | 44d9cd3f52a6b3317ba64049ea92cd6a99ca5a89 (diff) | |
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-qpr1-dev am: 8adc4f7f3f -s ours am: e9ae85a025 -s ours am: 04c0296a72 -s ours am: 44d9cd3f52 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12086570
Change-Id: I30054bebed6349472b9ee4468787bfeaff9916d9
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions