tree fec0e15d3ddcace01b988a904d2f577f9ab1b0d2
parent c134678791a74f2aa22c404bda9ef3a8a6fcb17b
parent 7784b632f0d7fe9fae07c78488fe2d18c7c46816
author TreeHugger Robot <treehugger-gerrit@google.com> 1598316644 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1598316644 +0000

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

am skip reason: subject contains skip directive

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

Change-Id: Ie8e590ce674ad98870db8b7ec424e79aed1e5646