tree 4726953f8b223653931d7cd8725b6faf327b41e7
parent bb0a801a85073a8383b814a24027e6f856224cb5
parent 42e8a0c2de377acb7692637bf3a7b54327629343
author Bill Yi <byi@google.com> 1519102606 +0000
committer android-build-merger <android-build-merger@google.com> 1519102606 +0000

[automerger skipped] Import translations. DO NOT MERGE skipped: a4513689c8 skipped: baff683653
am: 42e8a0c2de  -s ours

Change-Id: I21df47ac8511c2003fa9dd0c07065cb8f7cb8b28