tree 9ddef8fc8f720fd6d609f218e22e010306044360
parent 7cbe810992d578a397c52e1a2a2029ba91e31f31
parent e1a87e42884b048942c42cd8edf600afb628dde9
author Bill Yi <byi@google.com> 1495576384 +0000
committer android-build-merger <android-build-merger@google.com> 1495576384 +0000

Import translations. DO NOT MERGE am: b64355fe05  -s ours
am: e1a87e4288  -s ours

Change-Id: Ie863a452b8c0f2f4448002a97285ba736a1b073c