diff options
author | Bill Yi <byi@google.com> | 2019-08-31 16:08:57 -0700 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2019-08-31 16:08:57 -0700 |
commit | 84345490929d06e6dc37a450350d60a51729c7a0 (patch) | |
tree | 13c70d7840619aa72455a35c7da899ffe2b9b159 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
parent | eb699b5db3a644aef600bd2fa9020b476502111f (diff) | |
parent | aaea2b588c7e6d12e06c686e469b4a63a3309c44 (diff) |
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-qpr1-dev
am: aaea2b588c -s ours
am skip reason: subject contains skip directive
Change-Id: I31190e96eb2b9111e1505811f4ccb3c3e80a77dc
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions