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