tree 58852a14cafb38fd37f3393d0735d3c88f6ca7c5
parent 48ce5892e8490301ba60af2f293640579f2beaf5
parent dba8d2eeb4b256185360436725c32a2b1febacdc
author Bill Yi <byi@google.com> 1597794957 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1597794957 +0000

[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: dba8d2eeb4 -s ours

am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12403756

Change-Id: I7a85b209939df65602839039ba06c04ca20f3071