diff options
author | TreeHugger Robot <treehugger-gerrit@google.com> | 2020-05-05 15:44:36 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-05-05 15:44:36 +0000 |
commit | fc81780e21186e2fa2eb96c726a88218b7dc0cfb (patch) | |
tree | ffe0bbf4e3a1fab75f111d479ea4d21f13e02233 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
parent | eb6164085e2900828099fe0a3d276b9ad617465f (diff) | |
parent | 7116e69ad75bd5cd9b33ddbe294393e690d84696 (diff) |
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 6a215c34e9 -s ours am: bba456186d -s ours am: a4a5213ce8 -s ours am: 8a051583ac -s ours am: 7116e69ad7 -s ours
am skip reason: subject contains skip directive
Change-Id: I0e00c69d9aa1c0ad8278f363fb014bad22778a35
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions