tree 6b87cc33c477d2871c0d32037c9dd74e31064b18
parent 7f0716a65ebb2c341bd8ab646ef6b977ae8bfc65
parent 66239bfaa1e57d1e91e6edc45d2f33c0c4a4be02
author TreeHugger Robot <treehugger-gerrit@google.com> 1598152245 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1598152245 +0000

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

am skip reason: subject contains skip directive

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

Change-Id: I588be9bdc7fc5a367d0de98dd17dfac9c01c3a3a