tree 8bc7356806054cb830056f8305acdf675a302f28
parent aa05ee926d353b34ba8ab765c48df3b37a4e9995
parent 1275f03469161165de0d7223aa57b5669afcb86d
author Bill Yi <byi@google.com> 1624511640 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1624511640 +0000

[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 1275f03469 -s ours

am skip reason: subject contains skip directive

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

Change-Id: I8831ecaa3e1cd3bf02a2c5c52d29137a9716ca45