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