tree a36890cedd4ad19778c0fbcf48d08bb755fb08c1
parent 71ca326152c13dda9d713a99812696ecb3c2e080
parent 42b928cfb2e33026f14708444e65df16839de74b
author Treehugger Robot <treehugger-gerrit@google.com> 1641868413 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1641868413 +0000

[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: d255bc3a12 -s ours am: 6b8d134a37 -s ours am: 8409c3a0c5 -s ours am: 42b928cfb2 -s ours

am skip reason: subject contains skip directive

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

Change-Id: I1b7391e116d7d722f9cca8d58ddb0d14af17116b