tree 9ecf08449c7596b2885b46a5163756e9cbb9ec39
parent b734dcdd9d701d4cd5a3ce6e46fd32548e1bcc22
parent fdaa46fb5079726228db79ed489bdab651c02734
author Bill Yi <byi@google.com> 1469765728 +0000
committer android-build-merger <android-build-merger@google.com> 1469765728 +0000

Import translations. DO NOT MERGE am: 3c654c199e  -s ours
am: fdaa46fb50  -s ours

Change-Id: Ie03014fa0180bbfc1636b7362dc040c72e41828a