tree 89f89f38a0c68dfe4cb53b5c5a53cc1dfa4d74a2
parent d443627353b396be6425d0a3d113b487d41e21bd
parent c48a8b3dc316ffa11cc33237b4399d0dbbcef417
author Bill Yi <byi@google.com> 1478894297 +0000
committer android-build-merger <android-build-merger@google.com> 1478894297 +0000

Merge "Import translations. DO NOT MERGE" into cw-f-dev am: 11ea7e4283  -s ours am: 5e123b336a  -s ours
am: c48a8b3dc3  -s ours

Change-Id: Ic23205ef476f8d8c05028ed7f762e89a4cc94f60