tree 6aa2c5dd1dae57da7d728ac7dd0c3985dc78d11c
parent 90509b64fee7a8a016d94e496cdf8c586f7812ac
parent 1c9f9d50cf735b2b483bab62d603045afa6447d9
author TreeHugger Robot <treehugger-gerrit@google.com> 1597853997 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1597853997 +0000

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

am skip reason: subject contains skip directive

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

Change-Id: I89eb71a124a82e9b64173ff1c37d92d085b5902d