tree 718575d81340a8a87b5a21026e728f7f6261a796
parent cf614aa1eeeb7b991f319e32619b9d234412e338
parent 1419ef28741912e2c0b698e31d2546b6d54fffd1
author TreeHugger Robot <treehugger-gerrit@google.com> 1597079845 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1597079845 +0000

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

am skip reason: subject contains skip directive

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

Change-Id: I2fb7a80bdf3e12d70c16db7cdd1602ec5acd4f68