tree 3abaac29e2bb7afe23a3ceda30107897eb450bb2
parent 6d41bfd57bb12b6dbccdedd2874825d7cd95c82c
parent 2b9ed5236ae8e88152d67d8196d37a619fc2beee
author Bill Yi <byi@google.com> 1466116172 +0000
committer android-build-merger <android-build-merger@google.com> 1466116172 +0000

Import translations. DO NOT MERGE
am: 2b9ed5236a  -s ours

Change-Id: If5dd5a569fe7c117d2d198d7a807335982ed5770