diff options
author | TreeHugger Robot <treehugger-gerrit@google.com> | 2020-05-05 15:30:47 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-05-05 15:30:47 +0000 |
commit | 35419a1f4940b2c785b1f358f8b8b15c070169cc (patch) | |
tree | ffe0bbf4e3a1fab75f111d479ea4d21f13e02233 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
parent | 2d15104f481f05ee740403247540e94d201f52eb (diff) | |
parent | fb862dbfb8a0c8e8ff400e0dc0a8e177a97dfc37 (diff) |
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 6a215c34e9 -s ours am: 3c1027b6fa -s ours am: 166574a9a9 -s ours am: fb862dbfb8 -s ours
am skip reason: subject contains skip directive
Change-Id: I24cbc025010f03855ea417479a117b7e2d2c4366
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions