[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 3229884baf -s ours am: 69d06e9fb7 -s ours am: db20a16c5e -s ours am: 0537491a82 -s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15544163 Change-Id: I6c59d177c9d6a6eea343d2614fe03b57b144f656
This commit is contained in: