tree 05276219e5b4d680db2cf2ea23abc7209d6acbbc
parent 07e8416f8fb34644fcaf5fb58d8672c79707622f
parent 231d627b11737b3742635175cdc315b2c13cb686
author Bill Yi <byi@google.com> 1541173801 -0700
committer android-build-merger <android-build-merger@google.com> 1541173801 -0700

[automerger skipped] Import translations. DO NOT MERGE am: 28d6f81665  -s ours
am: 231d627b11  -s ours

Change-Id: Ia6ad8c0eda1e1990ecd176c1aad6ce619496628a