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