tree 677e4752464535d1c91d31eee921ce3f16159cfe
parent 22b95819841799f04c9bf7dd6c907804ddaf3a65
parent bdd997c3355713c318ff31a35f452fb54dc43a63
author TreeHugger Robot <treehugger-gerrit@google.com> 1596780143 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1596780143 +0000

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

am skip reason: subject contains skip directive

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

Change-Id: I2e9e3d96b56cbe9d472fbad3f5458b852ab63766