tree 908455ffa50309aeb56812bf57d390bb3f38bce2
parent e0966f00cbf488778f56baf5c2438690ed347039
parent 5677ba81d1bc69356f86d1ca2ebbf99a1c48abf3
author Bill Yi <byi@google.com> 1486109651 +0000
committer android-build-merger <android-build-merger@google.com> 1486109651 +0000

Import translations. DO NOT MERGE am: 7ef6922b49  -s ours
am: 5677ba81d1  -s ours

Change-Id: Ie40087344e103ba205326beb35ad1097e2888b0f