tree 205bcff458c6521ac1b82a985181ae0188de99eb
parent b104675957d33aa8482849263ee721bf9382d6ef
parent 7e6e9220da70c9f7089ca89ea5b3b5d341bf745c
author Bill Yi <byi@google.com> 1476980241 +0000
committer android-build-merger <android-build-merger@google.com> 1476980241 +0000

Import translations. DO NOT MERGE
am: 7e6e9220da  -s ours

Change-Id: Ibe7e7a4797602978d09a44aab39f49045f029748