tree 9b9be382044326e4da4cf0656d11a3fe1dffdef9
parent d2825d11534efb5863385aeefe8df11bd4f9b6e4
parent 327259aceb243770208a4df3b182aec4a11493d1
author Bill Yi <byi@google.com> 1470863237 +0000
committer android-build-merger <android-build-merger@google.com> 1470863237 +0000

Import translations. DO NOT MERGE am: cb782bd43a  -s ours
am: 327259aceb  -s ours

Change-Id: I274424b67476fae5d7b9c3c6d4738a0f4173fef7