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