diff options
author | Bill Yi <byi@google.com> | 2019-09-26 17:51:09 -0700 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2019-09-26 17:51:09 -0700 |
commit | 1b1480d0406b309971109042c3b6b1a9660b24ad (patch) | |
tree | ee619f3080ffe1f5ee01c7b037c7eac6a0eb8489 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
parent | b503acdbb1f6041515b16ca3f70e0b6ec0ce8f10 (diff) | |
parent | 17af0854250e9d66ff1e06e734cd54b2504b9650 (diff) |
[automerger skipped] Merge "Revert "Import translations. DO NOT MERGE"" into qt-qpr1-dev am: ad37297b2c -s ours
am: 17af085425 -s ours
am skip reason: subject contains skip directive
Change-Id: I2fc5bd39990f8ff8d9325108065f0e0be00c3bf9
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions