tree 0135649041e49f0a2888bc77e76b772cac205e30
parent 38ff9394d47f7aa060bb09cef55b65d285f74ec6
parent 079f2c6e13f5d2ce1149aa3b8fd4ad1283005ade
author Bill Yi <byi@google.com> 1470421108 +0000
committer android-build-merger <android-build-merger@google.com> 1470421108 +0000

Import translations. DO NOT MERGE
am: 079f2c6e13  -s ours

Change-Id: I2b2a64881b9d4f2f4b599baa5308045b513ecdfa