tree 9b9be382044326e4da4cf0656d11a3fe1dffdef9
parent f1c4b0179b5fb44bb9f10aec17bfb0169115b6a9
parent 26dfbda050e0ad302260d4e01d0fe0d5495fe72e
author Bill Yi <byi@google.com> 1470862876 +0000
committer android-build-merger <android-build-merger@google.com> 1470862876 +0000

Import translations. DO NOT MERGE
am: 26dfbda050  -s ours

Change-Id: I8100535aefeb00a5f8d880708e6f7338568c8cdf