diff options
author | Bill Yi <byi@google.com> | 2019-06-21 15:30:17 -0700 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2019-06-21 15:30:17 -0700 |
commit | 40ba79442fef6c88380f215ceb402b5840084e69 (patch) | |
tree | 1a9a61ee4dce54209a04b9ebdcd0ae0e09a74dbe /tools/aapt2/java/JavaClassGenerator_test.cpp | |
parent | 8f0c3ac7c6d5cd6d980d425390eb1d5f4dcf1d80 (diff) | |
parent | 772a340689f04b102c5b1ba9b69f832d7b192b87 (diff) |
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am: 019e1bf3fb -s ours
am: 772a340689 -s ours
am skip reason: subject contains skip directive
Change-Id: Ib6d83ef3007e068d3323803ff178afd1c8302b26
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions