tree 6bc4b742c96c7badaf2872f0798f7682542d7d6a
parent 421235fc8e1215356b0713b42293b37a3dfc399a
parent 40790e2b0dcb941f5f81598c8a2d8de03b0430da
author Geoff Mendal <mendal@google.com> 1458383372 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1458383373 +0000

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