tree 379700a9c8f5f6f78f2092b22569796f6bd6e54a
parent 4b5f1d45486dc4e8d661a1e59d4c378be88fd055
parent 5ac1b67317ad3ef57bc23e02bbde5f799412bc7e
author Bill Yi <byi@google.com> 1478024841 +0000
committer android-build-merger <android-build-merger@google.com> 1478024841 +0000

Import translations. DO NOT MERGE
am: 5ac1b67317  -s ours

Change-Id: Iebeff33fbc1d5c55a8b66bfda258ddb7658df7b7