tree 4e181bf522b7be01533cd222cfe72366e9755d1d
parent 3df86ce4fc8f114dd2a43405d0de7ed004570e42
parent fa110bea9bf02f8d33af17805af90ff0db687bbe
author Bill Yi <byi@google.com> 1565380731 -0700
committer android-build-merger <android-build-merger@google.com> 1565380731 -0700

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

Change-Id: Iad9b473268b8e4c40c637ef02dacfd14e77bde28