tree 221c709528c60e4db8c9478971c77fd6406cfc25
parent 2ad5f337570f7de4b5fa80767f9228d233c00a09
parent ef1f876f37bd647f7d30a46327625b046f72d1be
author Bill Yi <byi@google.com> 1523072634 -0700
committer android-build-merger <android-build-merger@google.com> 1523072634 -0700

[automerger skipped] Import translations. DO NOT MERGE am: 5d216c7e57  -s ours
am: ef1f876f37  -s ours

Change-Id: Ifb98c7149241d7217cdf6e3b629276c30a076498