tree 7df56a6e6bd3cc13454b6c7da8d1cd4c3afad142
parent f274ff65974b6f74d7d0008a0f3379b581e2cf7b
parent 2b41d966abbeba40e27dcdb89abf62edb12697c5
author Bill Yi <byi@google.com> 1494971341 +0000
committer android-build-merger <android-build-merger@google.com> 1494971341 +0000

Import translations. DO NOT MERGE am: 2dceb0fe40  -s ours
am: 2b41d966ab  -s ours

Change-Id: Ic0fd10e5e5d8a74089dfc4eafb5403adea0fdfd3