tree fd74b5a9a4ce2fb9224d4fecb339256408bb8137
parent 0a6795fee2d47a443490c1e7e68a3b7e18428b8b
parent 85a56ba1851db55889c054ce0ceab4ab7011213f
author Bill Yi <byi@google.com> 1563918134 -0700
committer android-build-merger <android-build-merger@google.com> 1563918134 -0700

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

Change-Id: I861e9b959fc32790c1f4ecff0ce47c24bfac1b71