tree b20c11c1092570667d6b7274d838c5991ae43462
parent 94034b059d993f8a81625e03f7a9e7a0b0008c03
parent 5001730e0102d82ff1abd6d0db11bffd591dacc2
author Bill Yi <byi@google.com> 1497321249 +0000
committer android-build-merger <android-build-merger@google.com> 1497321249 +0000

Import translations. DO NOT MERGE
am: 5001730e01  -s ours

Change-Id: I880512a9667318e38b4e15e9c9ea843bf8aa877f