[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 13db8fd570 -s ours am: 25ffaaeef2 -s ours am: 0b0641c934 -s ours am: 3ca03a99de -s ours am: 975b6663af -s ours
am skip reason: subject contains skip directive Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2230345 Change-Id: Iaaf2bffcf66d19efc66389d63619a5cefe18a495 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: