tree 1b1a44c93cf822b8b9397825e4d78adb7ef4be24
parent 6513f4ea184ad26a22d4b8875dba54d3040f8d5d
parent 3f0a3582f613c9d6f23eb1b744cca48fd3fa8117
author Bill Yi <byi@google.com> 1519115310 +0000
committer android-build-merger <android-build-merger@google.com> 1519115310 +0000

Import translations. DO NOT MERGE am: 041ee54441  -s ours
am: 3f0a3582f6  -s ours

Change-Id: I56905451d4999e6e8fd13ab275d3c976f7b55282