tree 4d1f81cb72e81401190693dfba3ac18e92beecdd
parent edd587c2a6c63c2f53b7a7d9c2ec2d57b3c4adff
parent 1da29b3f7789a195932465e42c0484166b359e2a
author TreeHugger Robot <treehugger-gerrit@google.com> 1596812491 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1596812491 +0000

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

am skip reason: subject contains skip directive

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

Change-Id: Ica5ba9d21d38210c1cb7ec597f314736fd34707d