tree b2c2c9dc7c316a97dfc9b81e64c003cb42bd0945
parent 3df957ecf6161320be8b3a5f8f539c6bfb7dbd8b
parent 36d4c74f87c62aaf06f1ef7a3fcbc4e232770c56
author Bill Yi <byi@google.com> 1574823016 -0800
committer android-build-merger <android-build-merger@google.com> 1574823016 -0800

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

Change-Id: I268cf8fe33a70ce556d52b9d3aec0b2bb48e5ad1