tree 8bdc9e5eedefcfb44ee6e87c13faf300a3512016
parent 6cd915b038dce7964400010cc3d568f3483d8277
parent 831cbc7d5318b2e28859e029b0706746d143bbf5
author Bill Yi <byi@google.com> 1470420238 +0000
committer android-build-merger <android-build-merger@google.com> 1470420238 +0000

Import translations. DO NOT MERGE am: 8bc8d4d4f7  -s ours am: 8fdb88e42b  -s ours am: 3d376a2be0  -s ours
am: 831cbc7d53  -s ours

Change-Id: I95835680a033e62e6c18a27299cee689c6b0983e