tree b4e9f4f7b0b9fadabaa32e6ef5495536adebeab5
parent bdd997c3355713c318ff31a35f452fb54dc43a63
parent 37a3d091ba9255906a11dc175730be8c1c2a08bb
author TreeHugger Robot <treehugger-gerrit@google.com> 1596781017 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1596781017 +0000

[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-dev am: 37a3d091ba -s ours

am skip reason: subject contains skip directive

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

Change-Id: I4492d29ee205814cdd4662b1b0fbdcf76be3a5d5