tree 7bd6658a133a099db772200ff95c6017bb71fd93
parent d3c0cf50b6c8e71c0c409abcd3b8c32f98f7cb71
parent f2189e945e28f79aa4e3fabd6ae342d4938f864f
author Geoff Mendal <mendal@google.com> 1458569536 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1458569537 +0000

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