commit | 2e10f7822585b850333673655a8a5db29d45a301 | [log] [tgz] |
---|---|---|
author | Bill Yi <byi@google.com> | Thu Jul 11 03:23:14 2019 -0700 |
committer | android-build-merger <android-build-merger@google.com> | Thu Jul 11 03:23:14 2019 -0700 |
tree | de7cd5ff0ceb100930f3cc89bc396678848a48c3 | |
parent | fda21b8db268e5c98e063cac7406f8e38bcc43b3 [diff] | |
parent | f6311a88da31c3aeae0ec5027956c7b8ceba7fbb [diff] |
Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am: 433e625341 -s ours am: 3e9da03d0c -s ours am: f6311a88da -s ours am skip reason: subject contains skip directive Change-Id: I503026bcf5eb543ad7733da3cc0dabe1f6a2a399