tree c6c7ff97483382ed10fe910c2bedb0878d89138d
parent 7340210a00c321a665dac386cdeb0708208804bd
parent 51987b1c2bc9802568e37baa6810cde7dece7c20
author TreeHugger Robot <treehugger-gerrit@google.com> 1644819439 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1644819439 +0000

[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: dd762a1325 -s ours am: 646f400c75 -s ours am: ecb1fe70ab -s ours am: 51987b1c2b -s ours

am skip reason: subject contains skip directive

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

Change-Id: I23d20c5b57dabac2817621eb652378abe4b62808