tree ba06a5721b1dc57cc044edab9fd0dd79a0eabc23
parent ee16d09327f0f4a81f89e3cba33814d08abb0c73
parent 523548f143733a347d3134f18b045004c01d5a6a
author Bill Yi <byi@google.com> 1608666157 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1608666157 +0000

[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 2e3b8fefa2 -s ours am: 523548f143 -s ours

am skip reason: subject contains skip directive

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I5f88b4217cb92f7830ee511a5720479011915fb7