tree 6aa2c5dd1dae57da7d728ac7dd0c3985dc78d11c
parent c6020bf4dc3bb0afc0ce95c8feeea87b0fc14243
parent 5739e1f8775a14984c49e4568758a68897331466
author Bill Yi <byi@google.com> 1597941169 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1597941169 +0000

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

am skip reason: subject contains skip directive

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

Change-Id: I1c82e4f6596bdfee0c15672ac72de469b43faab0