tree f75024b015e9f408125a4f84857db6521b8de3e3
parent 99fd5ed3c4d93a7981f6d42a1dad730ea560cbef
parent 87d87b41deeb7d9d6d4c77743af315b8481ebcbb
author TreeHugger Robot <treehugger-gerrit@google.com> 1649958325 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1649958325 +0000

[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: a78e679bd5 -s ours am: 87d87b41de -s ours

am skip reason: subject contains skip directive

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

Change-Id: I095cccbd994fcc7ee6653d91b3190c22c2a787cb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>