tree 67cb4021674eed9cad294fcaef5cede78fa71ab0
parent 6d3ed606a3cd300c0bdaea33b2b90a564985e15e
parent 2c164a79fdde5bafaab08f959e7a1355415e16a3
author Bill Yi <byi@google.com> 1530764476 -0700
committer android-build-merger <android-build-merger@google.com> 1530764476 -0700

[automerger skipped] Import translations. DO NOT MERGE am: 30b9cfb2a4  -s ours
am: 2c164a79fd  -s ours

Change-Id: I8bc94f4eae465b497eb568c59c2eb88ef54afb23