[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: e034d747f7 -s ours am: 88ab7252aa -s ours am: 1c4bc95593 -s ours am: 61f4e80a8c -s ours am: 6cfb32d50d -s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15693351 Change-Id: I9d6144bedd6b31b70dd4625609045d17ad03bb43
This commit is contained in: