diff options
author | Bill Yi <byi@google.com> | 2019-07-30 12:22:10 -0700 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2019-07-30 12:22:10 -0700 |
commit | 43d795f723a0dfd2ab673a7aa0106c7226adea85 (patch) | |
tree | 85ea7457386df1f6506c205d611f9e545a104d78 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
parent | 2c2efe9f6fa5226e5985c66b483f2f908622b7e3 (diff) | |
parent | 202762e7607d0e5a4ccc3706327286d5e9ccfb10 (diff) |
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am: 8292b6bb44 -s ours am: 7acde27742 -s ours am: c586cf6fb4 -s ours
am: 202762e760 -s ours
am skip reason: subject contains skip directive
Change-Id: If16813b1f5390ad664264153acc55258164e6007
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions