[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 21ad9800d4 -s ours am: 089d7603c1 -s ours am: 2f61ec166e -s ours am: 4016f6ecef -s ours am: b579c7fe6f -s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15902750 Change-Id: I4dc3c3ae6ea061c2e0cded8d2496062f5d1aace1
This commit is contained in: