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