tree 808c80b05792ca55ee081cf6b84cb853441d0ead
parent cd9a844f2f833ac9888aa60c93bd3ac1ce90e442
parent 957a261ec2a68b6e3ed6c82010375c05a27b1bb9
author Bill Yi <byi@google.com> 1481216927 +0000
committer android-build-merger <android-build-merger@google.com> 1481216927 +0000

Import translations. DO NOT MERGE am: d5c297aee0  -s ours
am: 957a261ec2  -s ours

Change-Id: I4da774ab1d5b8457cd352b76ab71cf9ecfe5d754