tree b7eb43fd968adcbc72bb62d979d1617176070600
parent f4861b7199bb81fcc38d457a37342587c38b6466
parent 5de09b24e5d97314a4fe93e2e484eefd5fee214d
author Bill Yi <byi@google.com> 1561876573 -0700
committer android-build-merger <android-build-merger@google.com> 1561876573 -0700

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

Change-Id: I83f80b03bc0b5226fef0ce8cab0d383fbbd6f781