commit | 8095dc033503a1407a4b5041ef30cb84c19980c4 | [log] [tgz] |
---|---|---|
author | Bill Yi <byi@google.com> | Sat Oct 12 12:35:35 2019 -0700 |
committer | android-build-merger <android-build-merger@google.com> | Sat Oct 12 12:35:35 2019 -0700 |
tree | 3b1b9217cf9d5c3a32a0a3c830ea3f88c15fe73c | |
parent | 5f9a1f096a238c8cc8c39c3e1bb2d6edf3e234fb [diff] | |
parent | c70c3a3236a2d3b88f602b049130e7635bfc9435 [diff] |
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am: e9fa91113e -s ours am: c70c3a3236 -s ours am skip reason: subject contains skip directive Change-Id: Ie9e6eda811ead3e547ba9c299dd790a3d5fb5aba