diff options
author | Bill Yi <byi@google.com> | 2019-08-27 02:47:48 -0700 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2019-08-27 02:47:48 -0700 |
commit | 97af5f0235c3aa954647107d8541c1f967ae8061 (patch) | |
tree | 770aba2abe77f98c97bc8c0a956af057c7b86817 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
parent | ca9ef12873868c4e65e778202fd176b27b3347b9 (diff) | |
parent | c5890d038ac479872c4f0d6ec2e5fa4e3f12e95b (diff) |
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-r1-dev am: b7ad07adad -s ours
am: c5890d038a -s ours
am skip reason: subject contains skip directive
Change-Id: I8b62e7edebfa088b2325f5e392f993070dd7a94c
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions