tree ac46969cea62dbadda3268ad73dd58225b96108a
parent a333d032d362b4daa8ece8e755a83cea8c22b9b6
parent 0de0845da921a1e76f524ccd81d746ef91631ba6
author Bill Yi <byi@google.com> 1563166496 -0700
committer android-build-merger <android-build-merger@google.com> 1563166496 -0700

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

Change-Id: Ic92b45c9e0bdca94a3036dacf62f4cd19aab4697