tree f00f23cc2db1a23dbe3b56a5d820a515ab691aab
parent 41a2cfde2d3f50474ab3f7715c71e9e97202a629
parent 9821bbab0e9adcae82968d70bf638dc37bab91c9
author TreeHugger Robot <treehugger-gerrit@google.com> 1644818468 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1644818468 +0000

[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 59ddfa6ed5 -s ours am: 9821bbab0e -s ours

am skip reason: subject contains skip directive

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

Change-Id: I671babedd370f15d5294e2217f4df1c767af78ea