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