tree 3ca4241fd9c69312f80d33a32b53637133e20d42
parent 16e66b0659183eeaaf9dddb4780e3cf20266200d
parent 1a5dbe25947ae7b908edbd6aa672b960d898977f
author Bill Yi <byi@google.com> 1508521455 +0000
committer android-build-merger <android-build-merger@google.com> 1508521455 +0000

Import translations. DO NOT MERGE am: a6a28406e1  -s ours am: 98a57d27e2  -s ours
am: 1a5dbe2594  -s ours

Change-Id: Iec39b0356f10f828e0cbde282bf320df330fe0e1