tree 74ab9a26c964a9ef0fdda030e61c32bc3d20f0da
parent 41d9c588eb74b650cc9ef342b149974e7592b7dc
parent cc5fdda22e65e4c7ad5f3ad3098fb8a32a239ce4
author TreeHugger Robot <treehugger-gerrit@google.com> 1595388038 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1595388038 +0000

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

am skip reason: subject contains skip directive

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

Change-Id: I5d678bf5dbb4fadea92236276f29c30b991ebbfb