tree f85e8cfe0bc9800c4dc3510fed9be0e86e898118
parent 5d195f2b0ea30541513ef3d4e79615928f6f8278
parent 9096df45ac0e3ea37da8787ce0e7187c278645aa
author Bill Yi <byi@google.com> 1479692353 +0000
committer android-build-merger <android-build-merger@google.com> 1479692353 +0000

Import translations. DO NOT MERGE am: d17b7a8bde  -s ours am: 29802a5e7f  -s ours
am: 9096df45ac  -s ours

Change-Id: I92d98420cdd48eb83af478db34365cfc03ac9c75