tree 466657dc9139969571eae6f89c6911f86ffdb6b5
parent 794c8ce7b73c60577fcc76a3e4d3e5edf7253494
parent 71e3e281e2f33b18838d5ffd1c9f7c2f81653d3c
author Bill Yi <byi@google.com> 1501116678 +0000
committer android-build-merger <android-build-merger@google.com> 1501116678 +0000

Import translations. DO NOT MERGE am: 327f6730c7  -s ours
am: 71e3e281e2  -s ours

Change-Id: I57cffb694d687744790736f0d417ffb8be802faa