diff options
| author | Bill Yi <byi@google.com> | 2019-05-22 18:19:11 -0700 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2019-05-22 18:19:11 -0700 |
| commit | dca1536b44f54c409fdd8b364b266af0b6bca6c4 (patch) | |
| tree | f5a2e71648b51d114e4b914a975f0b71ad1f1256 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | f06b53aa1bc8fb5cbec04705fec27c0440498a2f (diff) | |
| parent | 171a77af76cb3047650b027eba7f15f6fe068c6f (diff) | |
Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am: 91d2a1cc28 -s ours am: bdce4d4bd9 -s ours
am: 171a77af76 -s ours
am skip reason: subject contains skip directive
Change-Id: I0d924b0ac59953824c96230c0987c27112fc89ca
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions