tree 1f7709b410767c293cb8e86789533b1f60d4bef4
parent 922a15c1dac3303c3831a3190d8024da78bf6295
parent 73b407caba84f6304fd20f828475fbd35be4a57d
author Bill Yi <byi@google.com> 1631452402 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1631452402 +0000

[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: c2a03f945e -s ours am: 73b407caba -s ours

am skip reason: subject contains skip directive

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

Change-Id: I0a0430df2aeaf2c656d8dace804e89bea146ab72