tree 649a68f43e6ea20e95f4c08cd5eda707f4848829
parent b3c9c1cbe7a3978f2f483911a5c73fe7c1680ebe
parent 3d079b78d7f2d623707bd79445ff56d8e892f25c
author Bill Yi <byi@google.com> 1487258035 +0000
committer android-build-merger <android-build-merger@google.com> 1487258035 +0000

Import translations. DO NOT MERGE
am: 3d079b78d7  -s ours

Change-Id: I6a4174d36da9f8198ec724d3fddf21be9e05fa4c