[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 81012f4957 -s ours am: 7ae22d0319 -s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23558225 Change-Id: Iba7247cabd477b3493846be9df839f85945de460 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: