tree ca7aff16e047104cec2f61da941f9a62ca26400c
parent 1812c98af49d9cf3b1ecab021d9fca6eda0fee4b
parent b69b2d19fe0a7f27394c344ff09be7afa92a2e68
author TreeHugger Robot <treehugger-gerrit@google.com> 1625375518 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1625375518 +0000

[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: d89c0d5ded -s ours am: dc888dd6bf -s ours am: b69b2d19fe -s ours

am skip reason: subject contains skip directive

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

Change-Id: Ib90dcad1f3fc617b36420c1cd3570d0b0ec90bc5