tree 57b59b5d0fb233cc626f7f09a3dc2dbb7d87b05c
parent 53f5af79f1af159994ca31d8bf0a784e28e1eb73
parent 46bf87f2b73b1b60c2a0c2af2ab3bd45fb015e0d
author Bill Yi <byi@google.com> 1474141679 +0000
committer android-build-merger <android-build-merger@google.com> 1474141679 +0000

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

Change-Id: I337e62b762ee443e687232e0306be2d131b65628