tree 3ff6abff33d0c673a869ba3dd0ea36e2c2b0f54e
parent 6956a426da2a140d3299f17ac753a3b98b225935
parent a829ea2a1b8af8f42783ea698e489e2aacedb0c6
author Bill Yi <byi@google.com> 1513802208 +0000
committer android-build-merger <android-build-merger@google.com> 1513802208 +0000

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

Change-Id: I43254f2368f3e7bf8eb82a9b9b9ee04f6e2a86fe