tree 723c3f1656be256df7da2a36aaf5b04636163109
parent d991645bd3a6fcd4a9b555dca25349aa75ca2eb5
parent 54e5b55eb4416cc86a9c4e7d4fb99ab62e081c6a
author TreeHugger Robot <treehugger-gerrit@google.com> 1642277967 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1642277967 +0000

[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: bf586fee3f -s ours am: 54e5b55eb4 -s ours

am skip reason: subject contains skip directive

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

Change-Id: I4e0b8c9c5e91337851b8af9620552aa75acb0a9b