[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 377265ba62 -s ours am: 2cd65307fe -s ours am: 240adfae8a -s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23668013 Change-Id: I4458c67d583d425030a4a3ae61e404011a770c05 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: