tree e3c7d4ad65b0cb00d5970955dcdf743eb5559aa6
parent b3c3ab30b2c5d09ae48fab369fdda225fd6c7178
parent d6bf8d82ac9a8e0f177c8ab9a9e846e22c1140c2
author Bill Yi <byi@google.com> 1474083068 +0000
committer android-build-merger <android-build-merger@google.com> 1474083068 +0000

Import translations. DO NOT MERGE am: 76080c5b9f  -s ours
am: d6bf8d82ac  -s ours

Change-Id: Id994cf7a79b393704d3646b88de1990d14d93090