diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2020-07-06 14:34:53 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-07-06 14:34:53 +0000 |
| commit | f867f48e55d4902cd7c0cec963c186d35d8d931b (patch) | |
| tree | 14c2f9a0d1746438eb6ef897297c6b0c8e48e4a9 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 4de8e6c8d13b5f183862c0f71b73a5d0aab9177a (diff) | |
| parent | 2f2563935782cf86c3d1552dabb28ec9f0e24153 (diff) | |
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-qpr1-dev am: 1cdb57b79a -s ours am: cce78f1da7 -s ours am: 2d8b962698 -s ours am: 2f25639357 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12086566
Change-Id: I8e00fc900d9d3e59f2f8b95badffc3fef5613564
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions