tree 482772e30f52d984b41e3bddd68c5614c3c5449a
parent 5aa8230eb4a9939edd86b5360eb673dafe30226b
parent 30b5edfd2372f0454df111e7a2e354da69bbd93f
author Bill Yi <byi@google.com> 1485414961 +0000
committer android-build-merger <android-build-merger@google.com> 1485414961 +0000

Import translations. DO NOT MERGE
am: 30b5edfd23  -s ours

Change-Id: I8e401e5b1cdfa7506384c1aeab219697360bcf79