diff options
author | Bill Yi <byi@google.com> | 2019-08-05 19:21:52 -0700 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2019-08-05 19:21:52 -0700 |
commit | 568706949ccae4d42be86e50a4b77fdb4eb0a300 (patch) | |
tree | 4d1a44bf936abac0a6a0b6af4c0160e9645955e2 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
parent | bf3c004b9021860f2d912a319f97d6fe549415c3 (diff) | |
parent | 82d58c4aae145530147b6ffc0efb88e0463ddad1 (diff) |
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-r1-dev am: 3ca8c70e38 -s ours
am: 82d58c4aae -s ours
am skip reason: subject contains skip directive
Change-Id: I85ae2760c7eb7a4589b1e9ed949aa6207cea654c
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions