tree c84464884d7a0cb5aa17f7779fff6bc32559fc9c
parent ad5b6acf217f93f1279e094030dfe07e0aafe1be
parent 8502dacfca227b2abe53fab469c6bc770a5c43d2
author TreeHugger Robot <treehugger-gerrit@google.com> 1645728029 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1645728029 +0000

[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 6822a69f35 -s ours am: 8502dacfca -s ours

am skip reason: subject contains skip directive

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

Change-Id: Iad6aa8fd616fd9124217b6b30084b0b69de416e8