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