tree 205bcff458c6521ac1b82a985181ae0188de99eb
parent d5bc80036b98bf47339fea5420c2a232f830f8b9
parent 4559d2bfacad26634e37b16772fd2be9fedbaa48
author Bill Yi <byi@google.com> 1476981200 +0000
committer android-build-merger <android-build-merger@google.com> 1476981200 +0000

Import translations. DO NOT MERGE am: 4bfccb32a7  -s ours
am: 4559d2bfac  -s ours

Change-Id: Iff8ca804ae251a0462f148a236e7b4e8c9dd3e4d