diff options
author | TreeHugger Robot <treehugger-gerrit@google.com> | 2020-05-05 15:44:47 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-05-05 15:44:47 +0000 |
commit | 5e26126dc42b1de9ee642d98a6bc4e066bd2a1ee (patch) | |
tree | ffe0bbf4e3a1fab75f111d479ea4d21f13e02233 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
parent | fc81780e21186e2fa2eb96c726a88218b7dc0cfb (diff) | |
parent | 86aab7166d6f03df2c720f986ec504ee3e46683a (diff) |
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 08063278bd -s ours am: 1d1de27f54 -s ours am: 14d4d10748 -s ours am: 4ffdcf1e8a -s ours am: 86aab7166d -s ours
am skip reason: subject contains skip directive
Change-Id: I9159344d23b3ae5b01eceb689e03b6a490f26c55
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions