commit | ca4b67522c3a35e5e4727d3f6f477e93bf87541c | [log] [tgz] |
---|---|---|
author | Bill Yi <byi@google.com> | Tue Jun 25 08:59:26 2019 -0700 |
committer | android-build-merger <android-build-merger@google.com> | Tue Jun 25 08:59:26 2019 -0700 |
tree | ca7e5680db6b302d8f60a2f2185b5fc6a5680294 | |
parent | dbb9753e049d791d9e1958d3b49102eb63548f68 [diff] | |
parent | 28c0ad920e930f61fde8de5ecfd5c27dbfff0ff0 [diff] |
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am: c760a652ab -s ours am: 95460d28f8 -s ours am: 28c0ad920e -s ours am skip reason: subject contains skip directive Change-Id: I865c984a7d6b576ad049683fec5343ce93275436