tree 1c807ab7397f845f6f55753eae55f177480ccd7c
parent febe33b0534f31b53914ab8d67a4ca76f397e0b4
parent 8563a2027a0c0ce3fbd5fba6ae9665a643cc37d0
author Bill Yi <byi@google.com> 1561510781 -0700
committer android-build-merger <android-build-merger@google.com> 1561510781 -0700

[automerger skipped] Import translations. DO NOT MERGE am: 9b767fcba3 -s ours am: f9c445788b -s ours
am: 8563a2027a -s ours
am skip reason: subject contains skip directive

Change-Id: Icad87bed014583309c3a48e88107bd970b0064df