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