diff options
| author | Bill Yi <byi@google.com> | 2019-06-07 22:43:48 -0700 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2019-06-07 22:43:48 -0700 |
| commit | ae54b7daaa7719abfc3454745a7d5e7aaa3d93a5 (patch) | |
| tree | f5a7f8944466ac042158ab2bb6f7ed8390ce63a5 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | c4ef1973f5280b6d6cfb7519879e62ba5451918a (diff) | |
| parent | 80bbe491e444f6d8f61429c96732d565c1de417b (diff) | |
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev
am: 80bbe491e4 -s ours
am skip reason: subject contains skip directive
Change-Id: Iaf26109ee01cc4264b7f046bdd8963f0e95a51f4
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions