tree 4a4e8d01b2a0a57821151e7bda40016a4b5618df
parent fec7ec945ac51e17de601c26f31948b06b5b0aef
parent a76086102bbd70c9e96d86b4067db1c45a0d907f
author Bill Yi <byi@google.com> 1563152203 -0700
committer android-build-merger <android-build-merger@google.com> 1563152203 -0700

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

Change-Id: Icdc97102e568827261a5c83696e2dc60c8e10c0e