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