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