tree 7b6b34165e3ba7c4c67c37655a01491c86cd78b1
parent 2d081e964ce6c9db830a61309d609e23867a7ef1
parent c90971e33543b8e8097f48680fa2cba307ae2ef5
author Bill Yi <byi@google.com> 1485848341 +0000
committer android-build-merger <android-build-merger@google.com> 1485848341 +0000

Import translations. DO NOT MERGE am: 85f7e3989c  -s ours
am: c90971e335  -s ours

Change-Id: I5dd2cda575ce68aaf7a188a1b75f02191a40fefd