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