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