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