commit | 3daa38b7c7486379d9962c42471686c3b55bea74 | [log] [tgz] |
---|---|---|
author | Bill Yi <byi@google.com> | Mon Jun 24 08:54:48 2019 -0700 |
committer | android-build-merger <android-build-merger@google.com> | Mon Jun 24 08:54:48 2019 -0700 |
tree | 838e06127ae005960d2b149a5382bab3b92d9290 | |
parent | 34b8a8e248b99346a600800be1d3bb79ee90174a [diff] | |
parent | 1f87082fdd6fc6a73c8e0008360af09df2d01c7e [diff] |
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am: 25a43f362a -s ours am: 37caf4810e -s ours am: 1f87082fdd -s ours am skip reason: subject contains skip directive Change-Id: Ic4e9b31a09c3e97f205f03f7b97b18ac2afd1a65