tree cc69eaa318829f7992f8e69875f5bfc23b10524e
parent 35b76350c12e8a736905596c320237f8c7f6a683
parent 5b3ef71e48401bb9327ac5debe4e60786f011650
author Bill Yi <byi@google.com> 1505346921 +0000
committer android-build-merger <android-build-merger@google.com> 1505346921 +0000

Import translations. DO NOT MERGE am: 92cea99aa1  -s ours
am: 5b3ef71e48  -s ours

Change-Id: I319e758808845d8b6000e602bde39ed58127e488