tree bfbf917959e695e657502797f858c399e6dd4377
parent af7803854927fd1bff2980ec2422d1dbf112a344
parent cb9251233c307607e14f107c36188c8033624d4b
author TreeHugger Robot <treehugger-gerrit@google.com> 1632759747 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1632759747 +0000

[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev am: 3448d171d3 -s ours am: cb9251233c -s ours

am skip reason: subject contains skip directive

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

Change-Id: I2b6ae7fbceead9a19c781958b51d73d9d39e428e