tree 2ec44070d7128cfb6fdef2e494152dc3823f1cce
parent a46b96ebead07dfe08731c40edba18cbe893ccf1
parent a656f263d606fe16e9df0f0b2b47b829ee087602
author Bill Yi <byi@google.com> 1634132600 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1634132600 +0000

[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 3b6edf1163 -s ours am: a656f263d6 -s ours

am skip reason: subject contains skip directive

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

Change-Id: I1841dd4c4174801b6807542fd25a433f0153d8d2