diff options
author | Bill Yi <byi@google.com> | 2019-06-05 01:10:25 -0700 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2019-06-05 01:10:25 -0700 |
commit | 7ff21652bc27d175e50161ebab53a786baeacaaf (patch) | |
tree | 47d50836b9c8ac3e06756ef7c6acaeb620c5d933 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
parent | 84c120a610e10c1a6f41503ce8e06ff32b5677a1 (diff) | |
parent | d10a92f20c1298b3a67d714910cf9356e3bb7b81 (diff) |
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev
am: d10a92f20c -s ours
am skip reason: subject contains skip directive
Change-Id: I5f252cfd0b8139b027a0059f842fe654c6d24c0a
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions