tree c348e640d56e590d668c6c56b48477cfb12258a8
parent 7c4bb4a03abffec8316fad4f63dd948e1d32fd67
parent fb4361591a7059c6ddcf6a85eeaf07722862dbf4
author Bill Yi <byi@google.com> 1524890762 -0700
committer android-build-merger <android-build-merger@google.com> 1524890762 -0700

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

Change-Id: I85c3b6cd59f13145a0bd7e0b22fb34af07633c8a