tree c0c7f5ca1c085f4c1499545164ba4316497ecaa1
parent a725b0b7db810d33971af2938023df23c07231b6
parent 5d15c155a8e62f7e99b18ddae0d92a663dacc684
author TreeHugger Robot <treehugger-gerrit@google.com> 1640285762 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1640285762 +0000

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

am skip reason: subject contains skip directive

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

Change-Id: Idd57681527d6b9410a66912f88ddf92f074b34d6