[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: 793546f301 -s ours am: 3ee7de7a2c -s ours am: 1aef49b75c -s ours am: 475debb350 -s ours am: 7c20694a0a -s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17876168 Change-Id: I65c7ce32b213a185e2ffa5c747e529d05fc95087 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: