tree d842c3ac81d4a8d700f75629210591b06098e100
parent bfde3eca12ce16bcaad4e4a93353eb0e76d5be74
parent e5bf8de59c11c66043304c3126cc7618d0cf166c
author Bill Yi <byi@google.com> 1630269167 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1630269167 +0000

[automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 66739f75e4 am: e5bf8de59c -s ours

am skip reason: subject contains skip directive

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

Change-Id: I68769e08a0e5bdec380fd0eaa04b140b4bcbe248