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