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