[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: bc336f502f -s ours am: 095c6a7869 -s ours am: 62cf8a1490 -s ours am: 6df03379a6 -s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15638294 Change-Id: Iea8b8044ddfcc4eedc05be92e7a04c4a01740b07
This commit is contained in: