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