tree 469bd8c361ba198acfad230eb30aad8f96432cc6
parent 89edcf7f467ee716cb5c7f4d98598ccb97c1057a
parent 44b6267d306a6bb67b2dbf0191e143446bad5537
author Bill Yi <byi@google.com> 1496527254 +0000
committer android-build-merger <android-build-merger@google.com> 1496527254 +0000

Import translations. DO NOT MERGE
am: 44b6267d30  -s ours

Change-Id: I82f678d63cae1737f859857cb9ceb514fae01c2e