[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 71d8eb2518 -s ours am: d3fb7a6820 -s ours am: 097514acf8 -s ours am: 036d2a1a27 -s ours am: 9a041650e0 -s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15898319 Change-Id: I4128521f200514ad4f45f985d15d4f9c6097e143
This commit is contained in: