tree 3c1713d70e3882812a09960894136526912cf912
parent 4d1d0e9d92e708b532fa7338804f42938efdfcbf
parent 93ce6d50b8bcb6d3c232064e85a262e8d68b0310
author TreeHugger Robot <treehugger-gerrit@google.com> 1464972655 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1464972656 +0000

Merge "Import translations. DO NOT MERGE" into nyc-dev