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