tree 73d73337b68277ea3d9ffc2ebbd0a6181c3dd12a
parent 5fdde6c10f555dd077d1e13822f8ef9a3ad0c40f
parent 80fb38bdd7676c91b8f545d755bf70aa8faba4c4
author Bill Yi <byi@google.com> 1476770225 +0000
committer android-build-merger <android-build-merger@google.com> 1476770225 +0000

Import translations. DO NOT MERGE am: 5a05ce6409  -s ours
am: 80fb38bdd7  -s ours

Change-Id: I4c6e326f967f1daa8d2fa0c48b1cc9847625e2c1