[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 5419d3f04e
-s ours am: 1b68f107cf
-s ours am: 9c58f1e6d5
-s ours
am skip reason: subject contains skip directive Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2229959 Change-Id: Id3d18979de5a6edcafa9c9873842f192e5bc2fc5 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: