tree 8ddc97fc67d2a58388ea1e4468385794d5ed1d6a
parent aab08353b70051f60bf4e86b0dbbaa162f4ea791
parent ccac636733483cd99476bca7cde765870c020e12
author Bill Yi <byi@google.com> 1502554454 +0000
committer android-build-merger <android-build-merger@google.com> 1502554454 +0000

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

Change-Id: I9122bd0e063a4a43a04bb9d9691d2e9405892195