tree c0c7f5ca1c085f4c1499545164ba4316497ecaa1
parent 8e0de985aa590e68b4c06925797198de10086edd
parent 959bb4d763712edc94220e92382e87f691c86cef
author TreeHugger Robot <treehugger-gerrit@google.com> 1640286257 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1640286257 +0000

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

am skip reason: subject contains skip directive

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

Change-Id: I733964bb7af1bb759b223078eac79c5fdca19850