tree 57b59b5d0fb233cc626f7f09a3dc2dbb7d87b05c
parent 53f5af79f1af159994ca31d8bf0a784e28e1eb73
parent 83ccd60392482a0727a3ac704bc043cebcdc5a19
author Bill Yi <byi@google.com> 1474145483 +0000
committer android-build-merger <android-build-merger@google.com> 1474145483 +0000

Import translations. DO NOT MERGE am: 46bf87f2b7  -s ours
am: 83ccd60392  -s ours

Change-Id: I6319e68059ede59de445ba69e10516d62fe21593