tree 2b7bac3f8a1589c49df22031c7110824ca092d8a
parent 03b2d4c44cee59e4bbccd8be7707fd38f54bc839
parent 97e5272958bce3e4463d7d9eb17e70aee3829d9a
author Bill Yi <byi@google.com> 1511736921 +0000
committer android-build-merger <android-build-merger@google.com> 1511736921 +0000

Import translations. DO NOT MERGE am: 9ae05458f0  -s ours am: b2cc06ea43  -s ours
am: 97e5272958  -s ours

Change-Id: I6b5222e2b795f7c08279ca142eada5087cb2803a