tree 4c60108dda84acec9c8570d87bc53f3014b48a08
parent da36bb209b4cc35e3615a4b497c1063dead071c2
parent e480a1b11ae853f9e5c5b5d2de47352bafe2c5ef
author Bill Yi <byi@google.com> 1494498664 +0000
committer android-build-merger <android-build-merger@google.com> 1494498664 +0000

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

Change-Id: I857bdc01055cc8d5903fd4d9909601f1b6b57ea9