commit | a832fa895bebbdd2f5ce4eff1a24724283a6f0b5 | [log] [tgz] |
---|---|---|
author | Bill Yi <byi@google.com> | Sun Aug 04 02:28:42 2019 -0700 |
committer | android-build-merger <android-build-merger@google.com> | Sun Aug 04 02:28:42 2019 -0700 |
tree | 158d9cf6b42f0d324c46eae819cedced8855815a | |
parent | 292d4c31e54d9d926f3ae7bbaf9f9420cbecba76 [diff] | |
parent | 358c2af533d4ccd98a3a7a3e4d69d4638e4364d9 [diff] |
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am: ab6ef4f0df -s ours am: 3633c30ccd -s ours am: 358c2af533 -s ours am skip reason: subject contains skip directive Change-Id: I662703425358262619b3a117eacda82775abd6a6