tree d628e2150f54caa9da99f93a5ff8e48a05ac4e95
parent f6742bdd9c514a74aaba17f91ccd6d5250c27aed
parent f4882859a4117afa425d9d6bdfbd4bba805980a8
author Bill Yi <byi@google.com> 1471298994 +0000
committer android-build-merger <android-build-merger@google.com> 1471298994 +0000

Import translations. DO NOT MERGE am: 51db1ce659  -s ours am: 8519740f43  -s ours am: 62d6025b2c  -s ours am: e5b525a06a  -s ours
am: f4882859a4  -s ours

Change-Id: I88963adf0121790664a538aaecc661f3eb7a6483