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