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