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