diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2020-05-18 23:16:31 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-05-18 23:16:31 +0000 |
| commit | be9fee64fddbcd6ffb7992d08527174c67491c0f (patch) | |
| tree | fa5d13dde773516ee037884b269cf25a1c31cb7c /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 5c5440a0ea66c9eb604a08839d2223633a50fa2d (diff) | |
| parent | ff6b9350ff8a7935227cc9b07e22bcbd891b8a6a (diff) | |
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-qpr1-dev am: 0735b26fdd -s ours am: ff6b9350ff -s ours
am skip reason: subject contains skip directive
Change-Id: I554b7d1d5e22ca0689050cc2b6f7ca46e5d25674
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions