tree 3f410abad10e0b359dc6aff1873dda8ccde0931a
parent f9f2634d3ae174eaa38cd90e196292549217f9e3
parent 7205d79832f89eedacfd761da55e568849843111
author Xin Li <delphij@google.com> 1605660318 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1605660318 +0000

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

am skip reason: subject contains skip directive

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

Change-Id: I6dc34b5a7c39fc1040ca8e684b93f11ff0374b50