commit | 26aba21b435be548bede5cb729d8bdb1c25238da | [log] [tgz] |
---|---|---|
author | Bill Yi <byi@google.com> | Sat Jun 29 23:56:22 2019 -0700 |
committer | android-build-merger <android-build-merger@google.com> | Sat Jun 29 23:56:22 2019 -0700 |
tree | 43ab5e36d99055ebb8fa0d159a925cf4e14f9d4a | |
parent | ed749e50429edbb1b33272866568dc5863bdf545 [diff] | |
parent | 7488d6dfe57f9240bcc2951ceb0049aee45bf9fb [diff] |
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am: 5de09b24e5 -s ours am: 7488d6dfe5 -s ours am skip reason: subject contains skip directive Change-Id: I5f1e1708b3c0c0845643cd4b3c0756f06e5c0ffd