tree fd8c2c85a532e74be151fc67f493589be73b6f19
parent 1bf4f53596a55ef36979a7ad8d87b8aa98ff569c
parent fb0f1042e0bccb201b2a44db75ce91972623ac89
author TreeHugger Robot <treehugger-gerrit@google.com> 1636997620 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1636997620 +0000

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

am skip reason: subject contains skip directive

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

Change-Id: Ia231be1005785a1d68dd749cab1631db9492596d