tree e1bed0ecd595a77cf703e3afff93b2a9f965910f
parent 94d87aa5f4fd1603b5ff0669558afad4e40543c9
parent f2528db4de73ee713056e5d7f49c56c654a15ab9
author TreeHugger Robot <treehugger-gerrit@google.com> 1593993891 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1593993891 +0000

[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-qpr1-dev am: f2528db4de -s ours

am skip reason: subject contains skip directive

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

Change-Id: I1ccbbb5c5c2de481e72808820b1035d35a0bf1f3