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