commit | dc754ce7916f62247e689cb5144848e857265ab3 | [log] [tgz] |
---|---|---|
author | Bill Yi <byi@google.com> | Sat Oct 12 13:19:50 2019 -0700 |
committer | android-build-merger <android-build-merger@google.com> | Sat Oct 12 13:19:50 2019 -0700 |
tree | 3b1b9217cf9d5c3a32a0a3c830ea3f88c15fe73c | |
parent | 06a6bf5ecca650965cd0643de973e295b59539c1 [diff] | |
parent | 4a9f2bce9a27aa833cac3d6325d4cdb438996c1d [diff] |
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am: 7604e64ecc -s ours am: 48fd3d016a -s ours am: 4a9f2bce9a -s ours am skip reason: subject contains skip directive Change-Id: I90f21d2c572ef03980a622ee9c92decc47269d7a