[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-qpr1-dev am: cc4a65b365 -s ours am: e861ab7cb2 -s ours am: b5de0ccd47 -s ours am: 1bfa101792 -s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12086503 Change-Id: Ic83cfc45de309c7bb6163553c8a5217d2df8169f
This commit is contained in: