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