tree e1117d8630bd9660a416a051ddf13940d3e65ca4
parent f34f9736a91e074a7f75aa71b4bb0250f921e36b
parent 2192d06b214a866c25327c0da52740ab5dc1e411
author Bill Yi <byi@google.com> 1486488736 +0000
committer android-build-merger <android-build-merger@google.com> 1486488736 +0000

Import translations. DO NOT MERGE am: ca2ead63c9  -s ours
am: 2192d06b21  -s ours

Change-Id: I5d6efc9f948b01823d854393bb4e319866aaa458