[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: f7bc199271 -s ours am: e67f93c365 -s ours am: 13cd6448ca -s ours am: f80bc03308 -s ours am: 2fec78d83d -s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18986210 Change-Id: I30bfa105942e2bb6af251c18f0079f9ae220b08e Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: