tree 715857a0faa6c41b11f20d3a86705e6aba4f23a3
parent 6587479603943a43577d59cb7b87d194fb5288f8
parent 715598ec912c4ac5a13b3fc8062fb7f683703115
author Bill Yi <byi@google.com> 1530852255 -0700
committer android-build-merger <android-build-merger@google.com> 1530852255 -0700

[automerger skipped] Import translations. DO NOT MERGE
am: 715598ec91  -s ours

Change-Id: Id3951730e9a54ef23cdaf8036f80d86f6e30c693