tree 209eec3efa43e43f1795f95905ae61eec575e3a7
parent 31e8da650a4803e692861a22a62f4f14190df357
parent f9fb5482bcbd2059b0ab3b0c263b7ad2f86cee29
author Bill Yi <byi@google.com> 1598108813 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1598108813 +0000

[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 1cbc5741db -s ours am: 3ed2fbad73 -s ours am: f9fb5482bc -s ours

am skip reason: subject contains skip directive

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

Change-Id: Ie54459896b23c9749f2d21593a7f768c403d78a2