tree 9b6a2ecd015c566a7a8781a4d9c2d63d9cfc226a
parent 6285a5e28324a98485ad62f029d598ed54582ee0
parent 4915614962327207b7334723801df58c6a51781a
author Bill Yi <byi@google.com> 1495132984 +0000
committer android-build-merger <android-build-merger@google.com> 1495132984 +0000

Import translations. DO NOT MERGE
am: 4915614962  -s ours

Change-Id: I624ec1f87bb86a1b134da30866dd2d533895f220