[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: a41b724a95 -s ours am: b8f343920e -s ours am: 08b9beb636 -s ours am: 69bed87cd6 -s ours am: 662e19b588 -s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18986137 Change-Id: I371a8a8483b9413a816b1c0d89d184fc2d641c93 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: