tree e7e82a712ddf5c26d5a970bad9fc95f1a05eff04
parent c1a010260882c36382705ad08aa9fea99f944ab7
parent 6e85f40a983b0eb50905d62d1ed1e8e6dde5eaa2
author Bill Yi <byi@google.com> 1491121744 +0000
committer android-build-merger <android-build-merger@google.com> 1491121744 +0000

Import translations. DO NOT MERGE am: 313c31a2d7  -s ours
am: 6e85f40a98  -s ours

Change-Id: I52c5ecee93405a467344fdaf95e808bf790f3a5e