tree 9bf4695e7f4592aaaa05ea5d46196ca6541e378f
parent 98a41ffda759cd9edcdd91554a093b15af6f73a1
parent 21f8bda9c951d132307622c76b150f642d4d7bd3
author TreeHugger Robot <treehugger-gerrit@google.com> 1592333019 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1592333019 +0000

[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-d1-dev am: 565af5abcf -s ours am: 6a9b77b0f4 -s ours am: 21f8bda9c9 -s ours

am skip reason: subject contains skip directive

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

Change-Id: I0def23b103491dcb422ce086fec06ce8c6b8288e