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