tree 781a8ca29a8521e25be724a5eed7a63a84653705
parent adf790c122a716f21a3b7f00fe23fbf1c349e3f1
parent a164c308417fcc7d2be60aa0da91bdbb34d7a74f
author Bill Yi <byi@google.com> 1502907189 +0000
committer android-build-merger <android-build-merger@google.com> 1502907189 +0000

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

Change-Id: Iecfc104ee0945ed2bb553159328fb72fdbdad2d2