tree be6edaec6445a9b690de75666fb7ffd306f6ff4d
parent 43dec636d7b52e7e2a1770ab9aa964b70412e1ec
parent 8b0b109fc36f407199feaaa97a763519622de629
author Treehugger Robot <treehugger-gerrit@google.com> 1641864091 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1641864091 +0000

[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 8b0b109fc3 -s ours

am skip reason: subject contains skip directive

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

Change-Id: Idd77628bd1355eef6658d826147ad1467bd7abd7