tree 31dfd0f2aa3204166871f72be66dac378f65b0c7
parent 77ec2cf4718cc29f87b556f856bd5b878855a69d
parent 083640b9db8f65e433053c72de26720dd22cdb93
author Bill Yi <byi@google.com> 1465480798 +0000
committer android-build-merger <android-build-merger@google.com> 1465480798 +0000

Import translations. DO NOT MERGE
am: 083640b9db  -s ours

Change-Id: Id2f104b9775ea1576393c506bbdbdd391eb9c58e