tree 50a4e715a7b694074e27149b84a58eefd5b58c8d
parent 6a1ec1b167a5cfbc0a2c05025cacf0b80023ba63
parent 4a28946f406aec82a4163799f3b8cde444ed0072
author Bill Yi <byi@google.com> 1565158941 -0700
committer android-build-merger <android-build-merger@google.com> 1565158941 -0700

[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am: 6aa3f38983 -s ours am: 1daf3587cb -s ours
am: 4a28946f40 -s ours
am skip reason: subject contains skip directive

Change-Id: I0fe48aed1e86bd485daf803e85f5f9d30d5ae06c