tree 88de3ea9a1da0d30f0fb77023649e7c348d31e6c
parent 2eb40f07f34f9d47a73dc98872707adefbe4dbae
parent bc611ec7e3b37072a30bdf9e33e068c41f0ea5a0
author Bill Yi <byi@google.com> 1466789897 +0000
committer android-build-merger <android-build-merger@google.com> 1466789897 +0000

Import translations. DO NOT MERGE am: 34f5924ca6  -s ours
am: 27465d7d0e  -s ours

Change-Id: I51b04e6def8892beaa909a88c46f8716e1b3b3b4