tree 81be9b132b330d655618477fd2c6dcec762e8c58
parent ab2d9d3e3753886c4ab2157ebfbba655038e89c5
parent 27c3ba01ff9f08abc56beca2b86d5322c14bfc04
author Bill Yi <byi@google.com> 1532930286 -0700
committer android-build-merger <android-build-merger@google.com> 1532930286 -0700

[automerger skipped] Import translations. DO NOT MERGE skipped: 1c484c5d96 skipped: b71941c9bb am: 976bb372c3  -s ours
am: 27c3ba01ff  -s ours

Change-Id: Id3d12a61dbf1a9e7eeabf1c12c39b8aa43ffe52b