tree 3e0b6e2d99225339425afc15af0babe428317b79
parent 9ee155dc02accb894d33b4f6650550be0d2b3af6
parent c169c169d5d61f25bae9201441740bd4ae78fd83
author Bill Yi <byi@google.com> 1636137411 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1636137411 +0000

[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-dev am: 12eeadedcb -s ours am: cd228d9043 -s ours am: faac160573 -s ours am: e527e727e7 -s ours am: 96aeb06191 -s ours am: c169c169d5 -s ours

am skip reason: subject contains skip directive

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

Change-Id: Ie9298d36742fe1e3885475517ced95b316a1cebd