commit | 784d0ba513bd4ea6d7d857c237d4c6fceda9f2d9 | [log] [tgz] |
---|---|---|
author | Bill Yi <byi@google.com> | Thu Jul 25 14:13:13 2019 -0700 |
committer | android-build-merger <android-build-merger@google.com> | Thu Jul 25 14:13:13 2019 -0700 |
tree | 0898532177dd9fb108655a05af38d73a5ccab39e | |
parent | c10e3ab60a39561d20de1543b49ceb2106cc7a70 [diff] | |
parent | 5304b688a32247eae8c7d1892eac23ae9d3dfe89 [diff] |
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-r1-dev am: e6283fda6d -s ours am: 5304b688a3 -s ours am skip reason: subject contains skip directive Change-Id: I252a730075d90baa8940b5e728ecfcf48875ef5d