tree 34dd28c5d5f57ba20bcc1cf8c538b966664d9fd1
parent 6afb5ee95c95c05b75849ef123987496186bd089
parent 0e378a8d4a31f72c9a6f96038d5f011f3b1af872
author Bill Yi <byi@google.com> 1465838424 +0000
committer android-build-merger <android-build-merger@google.com> 1465838424 +0000

Import translations. DO NOT MERGE am: 07edcb65d1  -s ours am: 2da4c336ec  -s ours
am: 0e378a8d4a  -s ours

Change-Id: Id2e97bcf0cdbfb685ae576c49b04023dce3adee8