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