tree d322840c50acd665ed0328b68e2c076ccbcc9094
parent bff70f8cd9e387cc323c2784b1472f84821926e5
parent 113501a7105ea2ef1e39bbdbe4fcb6758dc8fe4b
author Bill Yi <byi@google.com> 1563128685 -0700
committer android-build-merger <android-build-merger@google.com> 1563128685 -0700

[automerger skipped] Import translations. DO NOT MERGE am: d258871dcf -s ours am: 14758b23c9 -s ours
am: 113501a710 -s ours
am skip reason: subject contains skip directive

Change-Id: I5edfad8e01c85433077540ffc9fb785cdb762768