tree 2451cb938738438a07af8927357b77d195b2d342
parent 1c98d85cf6db5c636ec8341f10fe78c138d7ff0e
parent 2a3b062c4ac7f6f2a13b0500226785e8cbbb4c01
author Bill Yi <byi@google.com> 1485852179 +0000
committer android-build-merger <android-build-merger@google.com> 1485852179 +0000

Import translations. DO NOT MERGE
am: 2a3b062c4a  -s ours

Change-Id: Ic11826d8d728ca3324bd0bc75455ccf6fe7c3008