tree 328b1e4fb595678b1d6263e61ebdc7c94f71944a
parent 96db39691f2f08f85691cae148e440d2613461a7
parent bb2a8f15cbe7f00ef928e8696f74d7e8cda985e8
author Bill Yi <byi@google.com> 1485852420 +0000
committer android-build-merger <android-build-merger@google.com> 1485852420 +0000

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

Change-Id: I41d1afe145de55b33b6b20db3392d99e3debed19