tree a468d90d978cb6b5b64f547e180f4298a6e2b885
parent 7494eb2114f047f1d96a7520c95c72a8e4e2cb35
parent a0dd88b8dbcad55861191e429fc72c953e863811
author Geoff Mendal <mendal@google.com> 1458132275 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1458132277 +0000

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