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