tree 22147f867876adb8d6fa57daafffdb3eb82ff8d6
parent e35926e1aff2e6b9b54656bd59c8178e295a1b7e
parent 28b67f8eea62fa1521b988e2c42db87ff001ec26
author Bill Yi <byi@google.com> 1499742837 +0000
committer android-build-merger <android-build-merger@google.com> 1499742837 +0000

Import translations. DO NOT MERGE
am: 28b67f8eea  -s ours

Change-Id: I1f451ff10f7c09b0d960830f8985515c8bc0ab0b