tree 25b83df56bedf3967aee7633e3ffea191eb6ade0
parent fbf786dd9058eafa8da8a48b180cea735c97b2b6
parent 578bbbf4df2e756fa7cc0874b6390d872e31b63a
author Bill Yi <byi@google.com> 1539599504 -0700
committer android-build-merger <android-build-merger@google.com> 1539599504 -0700

[automerger skipped] Import translations. DO NOT MERGE
am: 578bbbf4df  -s ours

Change-Id: I045d4f0bb166101d7d236814c67921556a946e9d