diff options
author | Bill Yi <byi@google.com> | 2019-06-01 21:46:32 -0700 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2019-06-01 21:46:32 -0700 |
commit | f26f7053797e47f6f2040f1370608487b1b966b8 (patch) | |
tree | 450b55f1d819d3fa2eb75908073bddd56a6b8f90 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
parent | 0c65fb0931d379a765f6e4dfb58e6baee197abba (diff) | |
parent | b3b93d72fbafaf724de171a947ccf3a7710987a7 (diff) |
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev
am: b3b93d72fb -s ours
am skip reason: subject contains skip directive
Change-Id: Ie05e225f4a0ce0bb00b05fbef0768843f7504f49
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions