[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 2c6da471c7 -s ours am: 984e4e08fe -s ours am: c2bdca9eab -s ours am: ea5e71c4b7 -s ours am: a464a801e3 -s ours am: 659c87ea4b -s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17065876 Change-Id: I68d9df918b7fc4a74a23ab7f2944bc206e4163be
This commit is contained in: