tree 70ab56d38ba83f10bddc0017398fb353ec20ea0f
parent 3fd231d9925e5dadd36c6f850dc743a3e1f951a6
parent 168cbe5d8344e44480f3eda5fed61f29504a6316
author Bill Yi <byi@google.com> 1496864023 +0000
committer android-build-merger <android-build-merger@google.com> 1496864023 +0000

Import translations. DO NOT MERGE am: 2cce48fde4  -s ours
am: 168cbe5d83  -s ours

Change-Id: I7e483fc719cf5e9613e7d6296fa583a206a33299