tree 985174c3c8d59f92f99a5f79e48a04462aa4665b
parent 1b1d05e0a4aa40c08c6ef6ef878d466f0a6efb01
parent eeb712f1117cb7f7d372ac7c8d22dce2d3d76f40
author Bill Yi <byi@google.com> 1474946718 +0000
committer android-build-merger <android-build-merger@google.com> 1474946718 +0000

Import translations. DO NOT MERGE
am: eeb712f111  -s ours

Change-Id: Idc91e3b0e07c511aa6ddb15afe910a8d64421e23