[automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 6c9a21ae83 am: d78ef61842 -s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15960218 Change-Id: I24204ee72f5c12df157f8d33471fcc8be7bba909
This commit is contained in: