tree c0c7f5ca1c085f4c1499545164ba4316497ecaa1
parent 147ac52ac1e06e4bde4bc18c1802ab64552872b3
parent e11f54565e7c022734b9abc656fc2e6a6f16054c
author TreeHugger Robot <treehugger-gerrit@google.com> 1640286611 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1640286611 +0000

[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: e11f54565e -s ours

am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16517464

Change-Id: Ib2e6943ad1b73c5c11d0ecde793557dc3bd0c7ff