tree 3455062b5b07804ac0dcfa479994fd344f2a364c
parent e38b8fd0907f84ad9ffc65f37f12df2ac1335947
parent eb177d24415a2dd31d1fd3b864f4e65ecf022ff3
author Bill Yi <byi@google.com> 1466189593 +0000
committer android-build-merger <android-build-merger@google.com> 1466189593 +0000

Import translations. DO NOT MERGE am: 08fdb03e8d  -s ours am: d03a71ab66  -s ours
am: eb177d2441  -s ours

Change-Id: Ia42da5f73c4e7e255e51b19ab909e05a05a97b65