tree efb5783d7edd105587a72cfa5eaecd901f9f7af1
parent 48b68797e9f50a02d3e718fac2e3a4594376bb2d
parent 3c8db976063ee9a3900b1e0bb2d8f9f84b599ecc
author Bill Yi <byi@google.com> 1593307703 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1593307703 +0000

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

am skip reason: subject contains skip directive

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

Change-Id: Ic981155bca2cce8f732bce02dd67d9221a93f40b