tree 031be1b289ebaf6f873c22822f9514da3d38456c
parent 75203c08cd2fd92e06108d8f0686026568ad6106
parent 305109ece97994a209e2bee118de4d058261ccd9
author Bill Yi <byi@google.com> 1498928942 +0000
committer android-build-merger <android-build-merger@google.com> 1498928942 +0000

Import translations. DO NOT MERGE am: e91fbdc399  -s ours
am: 305109ece9  -s ours

Change-Id: I608fac75180e68ed5a6355e4e5f2f7812b61b261