diff options
author | Bill Yi <byi@google.com> | 2019-06-30 00:12:18 -0700 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2019-06-30 00:12:18 -0700 |
commit | 8e88028ab5f1d3196ca4588d21b4d2d709de05b1 (patch) | |
tree | 070d1fbf85b1652fdedb7ad8c516f4993e9c4f65 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
parent | c841bddc55bd6dc4cffe3eed14f3ad5c7a69d551 (diff) | |
parent | 26aba21b435be548bede5cb729d8bdb1c25238da (diff) |
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am: 5de09b24e5 -s ours am: 7488d6dfe5 -s ours
am: 26aba21b43 -s ours
am skip reason: subject contains skip directive
Change-Id: I2dfb2378da93e56f8b2107509a4d763f9ade939a
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions