[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-qpr1-dev am: 1cdb57b79a -s ours am: cce78f1da7 -s ours am: d5ee9d3d5f -s ours am: 2d130de097 -s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12086566 Change-Id: I4d1b221be2953c66a514c96e96006ef7c65fb179
This commit is contained in: