diff options
| author | Bill Yi <byi@google.com> | 2019-06-19 23:29:18 -0700 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2019-06-19 23:29:18 -0700 |
| commit | cb455928c76cf02e383124072bba6ff5c253e239 (patch) | |
| tree | f55a4e8b9f47ba950144ed2d9f191320dbf11040 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 6c40441ce026bb7a1241a0c2e5a61623299f1aa4 (diff) | |
| parent | 212f775a213affcbd2605d8a5945ec31e7ffd90b (diff) | |
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-r1-dev
am: 212f775a21 -s ours
am skip reason: subject contains skip directive
Change-Id: Ide54af815b66e04d8f51748efe4d4a41fbfe3250
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions