[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 7d1dbd3e1e
-s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21531846 Change-Id: Ib474ba7658438e6aa73bce78ad86bbfb7c03fde6 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: