[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 675179075c -s ours am: 6bf1d3b6cc -s ours am: 0139435f36 -s ours am: 9aa61fb21a -s ours am: c1a68f619f -s ours am: 9b12b50f1d -s ours
am skip reason: subject contains skip directive Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2614631 Change-Id: I7e420e169fcfe32d3a7c892839d512f963371804 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: