commit | f15a2dd3947c323bf06a90b0a6564bea970ea32d | [log] [tgz] |
---|---|---|
author | Bill Yi <byi@google.com> | Tue Jun 18 16:07:39 2019 -0700 |
committer | android-build-merger <android-build-merger@google.com> | Tue Jun 18 16:07:39 2019 -0700 |
tree | 90d724e7784994ae01771f9f83600f581f03364c | |
parent | efb53ead7d57f65c3c5d3c3ebb035f824619f33c [diff] | |
parent | 5e26e1d81c314a2be252527bd65dff83b968a38c [diff] |
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am: 9ea1842c38 -s ours am: 5e26e1d81c -s ours am skip reason: subject contains skip directive Change-Id: If7826230f6c7152de69141e4072337419075d1da