tree 0bec66d6e6f51e7a5e0a379748858942735201d5
parent f93bef4a29c94acf08918b97dca02bdb134d03e2
parent 0037adf4de884beafca60899d26c916bebe5e3ed
author TreeHugger Robot <treehugger-gerrit@google.com> 1641709743 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1641709743 +0000

[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 21228bd1cc -s ours am: 57f5e0b692 -s ours am: 027ca4ba9b -s ours am: 0037adf4de -s ours

am skip reason: subject contains skip directive

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

Change-Id: I0fb77ccae4b9066614365b5d2ce595ebfa06ac59