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