tree f902d5bdb0f6f238fd68974a15dea3a6a6558505
parent fb7e68ea573f4c0ce7361756fe465d324c70dee8
parent 4e54c2040e315171565e9c0257b7c4c2736a8004
author Bill Yi <byi@google.com> 1624238894 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1624238894 +0000

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

am skip reason: subject contains skip directive

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

Change-Id: I56b2312fd3460e1536e80ad1a5dcf2807a638152