tree 6c7a0a8ff0155c3141ef65d02089d3b66c071b84
parent caab9a7889b7ce6311d221f93494be8af8c965a1
parent bb5f87bd1c98ada68220b3617bb5b56e28dafba6
author Bill Yi <byi@google.com> 1491122495 +0000
committer android-build-merger <android-build-merger@google.com> 1491122495 +0000

Import translations. DO NOT MERGE am: 60102ca02f  -s ours am: 6f9b1a22d4  -s ours
am: bb5f87bd1c  -s ours

Change-Id: I0178f676e4c676f6f1a59f5f12ce9c960d9dba69