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