tree 9351d9e6e16e2667cc1c94f79e3740decef7d0ad
parent 8e78df75e02ded08f3362de56cd3727c17f8f20b
parent b7ad07adad60dba1ee2e467c741d586672976a4d
author Bill Yi <byi@google.com> 1566522112 -0700
committer android-build-merger <android-build-merger@google.com> 1566522112 -0700

[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-r1-dev
am: b7ad07adad -s ours
am skip reason: subject contains skip directive

Change-Id: I8b03ad968fa1647c878f1078e9941669461f122f