diff options
author | TreeHugger Robot <treehugger-gerrit@google.com> | 2020-05-05 15:25:05 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-05-05 15:25:05 +0000 |
commit | 2d15104f481f05ee740403247540e94d201f52eb (patch) | |
tree | ffe0bbf4e3a1fab75f111d479ea4d21f13e02233 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
parent | 1b1d501d579bfa3d24845eaf7c69bda8aa0a53bd (diff) | |
parent | 87329bdcb680e17a61447e1f89a24aa84d536e45 (diff) |
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 6a215c34e9 -s ours am: bba456186d -s ours am: 3236ba7978 -s ours am: 87329bdcb6 -s ours
am skip reason: subject contains skip directive
Change-Id: I4913680dce5847419880a8cf9a480f9a4de781bb
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions