tree 1cfa05eae4c5b55decacaf334dfc3161be465975
parent 9623ec021493508ebb489c8193c402e69afd0080
parent 722903594e0851a77cd6648f24e80d8509addf3f
author Bill Yi <byi@google.com> 1471456103 +0000
committer android-build-merger <android-build-merger@google.com> 1471456103 +0000

Import translations. DO NOT MERGE
am: 722903594e  -s ours

Change-Id: I250c39b7fb65641fcb2ea1f593511a76cc2da24a