[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 8646abf978 -s ours am: bd86f72807 -s ours am: 78372a44e8 -s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15460600 Change-Id: I62a4741f1574ff5ebfa3123b788f6a7b2d66493c
This commit is contained in: