tree c851a5e2136089f36c21da69f3e0d0874261799d
parent e8c0aba148989a11f4c898662a3e1e646ef71260
parent 257375a7da3d341b827c879b9c0ab445ef9afd9f
author Bill Yi <byi@google.com> 1554747761 -0700
committer android-build-merger <android-build-merger@google.com> 1554747761 -0700

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

Change-Id: I8b33bd72eaead5fdb0e53fd1bd8a86ddcebd5dcd