tree 64f5b3f074c93762679bfc9ce1a5e76288b8a79c
parent 83b7531e1bb206056b7bcab8f98cf2ab0b996460
parent ab6ef4f0dfbf72f74e78f50ef89c8e6c5d9022ce
author Bill Yi <byi@google.com> 1564906837 -0700
committer android-build-merger <android-build-merger@google.com> 1564906837 -0700

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

Change-Id: I6ddd3a2f1d738ea3b49e746ff102fe7515c9d50a