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