commit | 6b24bafe387e62d676d1ec32fe3b7438ade496da | [log] [tgz] |
---|---|---|
author | Bill Yi <byi@google.com> | Fri Jul 12 14:59:13 2019 -0700 |
committer | android-build-merger <android-build-merger@google.com> | Fri Jul 12 14:59:13 2019 -0700 |
tree | 4df0eb7d9be5898637aaa3c7061a8e2ceb6e8d1d | |
parent | 3de0e8a82e5508f96bd8974381f302920ad1b223 [diff] | |
parent | b3e35759ab847860ede5a7c20e99c85358fb4663 [diff] |
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am: 1feb0dfde8 -s ours am: 35d50b84a6 -s ours am: b3e35759ab -s ours am skip reason: subject contains skip directive Change-Id: Ifdc56598c110b32325622722b38cc70f2687d764