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