tree 63adf07893c84bedee3105c40c6a38959d5035ac
parent bffc31ea640c70ccb9e54432ea2cfa05cc5b4fb6
parent 3c9c7ca3376a1f30499816007d3af25ba4e67b4d
author Bill Yi <byi@google.com> 1501055414 +0000
committer android-build-merger <android-build-merger@google.com> 1501055414 +0000

Import translations. DO NOT MERGE am: 961b18d42f  -s ours
am: 3c9c7ca337  -s ours

Change-Id: Id50ff04e0234fd19fdcb534a5c52cdc61e3ed8e1