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