tree 6eeedafc6f4663960bf4024c3cb4004cd17f080e
parent 05a0c5fae344872b1309d6b7e40ce3db0712edd9
parent 47559fb858221d99655188f51642f7644ca4fd37
author Bill Yi <byi@google.com> 1496250132 +0000
committer android-build-merger <android-build-merger@google.com> 1496250132 +0000

Import translations. DO NOT MERGE
am: 47559fb858  -s ours

Change-Id: I53d738f606f30919e47c5b08fd81bc61696fa926