tree 4c8183db8a19c05388d66a4ca4e14e03e5b52d53
parent 9355bce0c323632b88620ede174bf023b7381c81
parent f54038169cce470f75c723c89616e63b5204ef5d
author Bill Yi <byi@google.com> 1487291777 +0000
committer android-build-merger <android-build-merger@google.com> 1487291777 +0000

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

Change-Id: I1524a1cd097f8394cf067f61880efc55f7e48627