tree d7eaeb4ccd2eacd4bbf0f1c00f805d3ef06d8967
parent 4729c1b53c699daadf54fcc5bb3a577bcae3906c
parent 3de7ee44630b0223202324f70b2b607daa4e9aa5
author Bill Yi <byi@google.com> 1501099007 +0000
committer android-build-merger <android-build-merger@google.com> 1501099007 +0000

Import translations. DO NOT MERGE
am: 3de7ee4463  -s ours

Change-Id: I9222199d59a75e5a190139e134a5cff74727f9f3