tree 6aa2c5dd1dae57da7d728ac7dd0c3985dc78d11c
parent ed312ef4fad684d5491a5397f52a49dd7a1da98c
parent 4b4b2b29faa74bb25648e8e5558cc32410078e6d
author TreeHugger Robot <treehugger-gerrit@google.com> 1597883585 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1597883585 +0000

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

am skip reason: subject contains skip directive

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

Change-Id: Id81057446689d4c1874d17f582f7738aaa62b180