diff options
| author | Bill Yi <byi@google.com> | 2019-07-25 15:10:41 -0700 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2019-07-25 15:10:41 -0700 |
| commit | 1458cb80ab5186efd46adc9b06e5ff338dae10fb (patch) | |
| tree | b83fa54958d337891ecd88273b4ac1955bd7fb61 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 46bdbc367517b40efdd11ae06c6b650dfb253761 (diff) | |
| parent | 6c4b6f827697a573023b668b246862a215228ec9 (diff) | |
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-r1-dev am: a1a6fe2bab -s ours am: 8b5025f0f2 -s ours
am: 6c4b6f8276 -s ours
am skip reason: subject contains skip directive
Change-Id: Ie7ef5caaa3ce1f34e3819721f4cc0a6fc5f4ad3c
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions