commit | 515803484d3d68e9d772d456737e06eb3aac1ced | [log] [tgz] |
---|---|---|
author | Bill Yi <byi@google.com> | Thu Jun 13 21:59:02 2019 -0700 |
committer | android-build-merger <android-build-merger@google.com> | Thu Jun 13 21:59:02 2019 -0700 |
tree | baa302c3baa0f961ab04deb00c7e6e5d114a2245 | |
parent | 73a8a018ce264d17b95287e59d7d047e18bb0d80 [diff] | |
parent | 60ce76cfa0b8307598e30bd7e940ea7e5c67c4bb [diff] |
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-r1-dev am: 9157a333d5 -s ours am: 60ce76cfa0 -s ours am skip reason: subject contains skip directive Change-Id: I4b89ebe073d72f8788706701fc52539aeba39571