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