[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: 321bc7cceb -s ours am: ee573f4e36 -s ours am: e5f9c3da5c -s ours am: d521259680 -s ours am: 0695e750c5 -s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17876523 Change-Id: I584a62fdbbc1fd45a04bd2739bb9f5864f34715a Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: