tree 47d05b06663edf8ee117235009d3b7551f033724
parent e5350c9e20a7d9bfee8e5fbcda181dec69ac06ca
parent 4d181cc04f59f5a4f1d9e79c8dcb797c6b4759ca
author Treehugger Robot <treehugger-gerrit@google.com> 1607272731 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1607272731 +0000

[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 4d181cc04f -s ours

am skip reason: subject contains skip directive

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

Change-Id: Iafacdf7b241ac8c7f4aa65861f885868bc4578dc