tree d44dfe83000da3a6340f7f1cd1305d737e139492
parent 74c6c21b96709cae7be9218000a7eaac9019d75c
parent 3d88c92bb39aea5024855065e8277cdde6ae23ad
author Bill Yi <byi@google.com> 1596610911 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1596610911 +0000

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

am skip reason: subject contains skip directive

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

Change-Id: I665b7a80515675b90ed66d0c59ecfdf12c45b59e