commit | f1dd8f590e97cacd249a408e2e17040789f0ec69 | [log] [tgz] |
---|---|---|
author | Bill Yi <byi@google.com> | Tue Jul 09 15:36:49 2019 -0700 |
committer | android-build-merger <android-build-merger@google.com> | Tue Jul 09 15:36:49 2019 -0700 |
tree | 734b605be3bf5f87dfcbe0173e92d366678391d0 | |
parent | a155922d3c25996eac4329aa9a0dc3c8b9a81f28 [diff] | |
parent | 4d662f8e762b763ed5799d719ab5399d3fc02fe5 [diff] |
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am: a5121a4fa9 -s ours am: f97d15933f -s ours am: 4d662f8e76 -s ours am skip reason: subject contains skip directive Change-Id: Ifad7b1d8733daaf2ce42ac320a0f582de7bbb0a8