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