tree 7a8b3ed48494b5c24f2015d463a44804575e9e1a
parent 72a412a6c72449f2e009941c1513fdf69bbe760c
parent c3c1e0a9835d927ca3ec710e056cee4919da005c
author Bill Yi <byi@google.com> 1483109355 +0000
committer android-build-merger <android-build-merger@google.com> 1483109355 +0000

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

Change-Id: I49313188e7896baf3121d7abbad57597c6294ae4