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