tree df3e2531dbc2062eab1729f982bdb9036443d365
parent ee254e4f9b4f5117b3044c5db82c245bf0b3fe86
parent 601a976784e6e26551e6cf34d1cee4661b969c54
author TreeHugger Robot <treehugger-gerrit@google.com> 1625455586 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1625455586 +0000

[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: ede5191d7b -s ours am: 601a976784 -s ours

am skip reason: subject contains skip directive

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

Change-Id: I75d5356515fa6a3876b7edaaed8d2223d7849b68