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