commit | 7704960b61068e89a6ed14dc07b84e9db4ad7ade | [log] [tgz] |
---|---|---|
author | Bill Yi <byi@google.com> | Sat Oct 12 12:42:04 2019 -0700 |
committer | android-build-merger <android-build-merger@google.com> | Sat Oct 12 12:42:04 2019 -0700 |
tree | 281b488ff00e961dfcf06a6759d146f8f66eaef0 | |
parent | abdc40137576b765904cdd8b7cb3d7df539e4400 [diff] | |
parent | a8b8b8a541d011d71c8e41f1dcdb2e75bb502071 [diff] |
Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am: 41c7e07d12 -s ours am: 0bc3df3750 -s ours am: dc9a31d129 -s ours am: a8b8b8a541 -s ours am skip reason: subject contains skip directive Change-Id: Ibb2e8e5af533e26893219e214f940f65ec994784