tree fcc0349353273aa62f307117a83b9f1fdb7bbef0
parent 764d6afeffeddc000f0a4a6c24b6ee5a92bd2c22
parent 61564d79abe15d884c23fc5d23f20a8951227002
author Bill Yi <byi@google.com> 1550823521 -0800
committer android-build-merger <android-build-merger@google.com> 1550823521 -0800

[automerger skipped] Import translations. DO NOT MERGE am: 0a2ed801db -s ours
am: 61564d79ab -s ours
am skip reason: subject contains skip directive

Change-Id: Iac12de84eb9ca67cd947325a99be68aee17f45b6