tree af22c2a4197ec4869090c774dd5f39513dbfc44d
parent 7c1a615cf413be5c2948f8f4ffe96541be03007b
parent bb8b32262f803a3cc273edb57881fcbc328ba186
author Bill Yi <byi@google.com> 1465905993 +0000
committer android-build-merger <android-build-merger@google.com> 1465905993 +0000

Merge \"Import translations. DO NOT MERGE\" into nyc-dev
am: bb8b32262f  -s ours

Change-Id: Ie868e30032e9dc633bd2205413704d30801fd815