tree 7a8b3ed48494b5c24f2015d463a44804575e9e1a
parent 12355258d7d764109dc3d1b0fd0604d9b2cf2a0c
parent 668a1829df1c2294cafb5a704a006b831e0c8ebd
author Bill Yi <byi@google.com> 1483094102 +0000
committer android-build-merger <android-build-merger@google.com> 1483094102 +0000

Import translations. DO NOT MERGE am: 6173d397d2  -s ours
am: 668a1829df  -s ours

Change-Id: I1f1dcf22e8f580fa42588fc4bed5be37bade8ddf