tree e729dc3b5505684b798e12aa54246ab745a99532
parent f680aef9eb6ad8350dd2ea91aa5f23e6feff6b89
parent 592bf18fca268fb7677031cd7cfe193fc287d591
author TreeHugger Robot <treehugger-gerrit@google.com> 1645206632 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1645206632 +0000

[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev am: 550ca84b5f -s ours am: 592bf18fca -s ours

am skip reason: subject contains skip directive

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

Change-Id: I40ed259dda3c367627f36a4c1a427b6616d7581b