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