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