tree 600aad0c01b67522349d0b2be421865f045c72f9
parent 10391d3b188a6c27dc4ba2a1b51cabb97f478afa
parent 929867e5254d6c04ba7dc2bedd7e4e4cc944ffac
author Bill Yi <byi@google.com> 1494971540 +0000
committer android-build-merger <android-build-merger@google.com> 1494971540 +0000

Import translations. DO NOT MERGE am: 2dceb0fe40  -s ours am: 2b41d966ab  -s ours
am: 929867e525  -s ours

Change-Id: I2f773c4fc9fa086750567274c04b8bcabb3002cb