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