commit | 7b24ec6a1f94711bc56aaac6792fd3d1f7370755 | [log] [tgz] |
---|---|---|
author | Bill Yi <byi@google.com> | Sat Oct 12 10:59:57 2019 -0700 |
committer | android-build-merger <android-build-merger@google.com> | Sat Oct 12 10:59:57 2019 -0700 |
tree | 3b1b9217cf9d5c3a32a0a3c830ea3f88c15fe73c | |
parent | 675bf55475941c78119e4f1ac1ef850e1c775fdf [diff] | |
parent | e92a1a9c2a3f6226726b230fa03a6657fc98d36c [diff] |
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-r1-dev am: e801eb78f0 -s ours am: e92a1a9c2a -s ours am skip reason: subject contains skip directive Change-Id: Iabbb3d37b7c47cd0edfb6a38f447fcb23dd7163a