tree 0770f3fabc4e7ab0c5b07cfe9829d30f708e9452
parent ea55cefcbbe7d0e4ba72915ede26a16c5e97d863
parent 978f6e037ea208bbc27e7879f6ebf31535b5f085
author Bill Yi <byi@google.com> 1526825175 -0700
committer android-build-merger <android-build-merger@google.com> 1526825175 -0700

[automerger skipped] Import translations. DO NOT MERGE
am: 978f6e037e  -s ours

Change-Id: I997d8463512934c0e86ddeca417cc9425121f1a8