tree e45d0b729dc3f53a390cda6a29a468b0ed333d74
parent a4fe2389058dea713aff32a54b5754c4999b6402
parent d2ed77384faeb5b00bb6dbf64251fba7c2f95857
author Geoff Mendal <mendal@google.com> 1456327392 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1456327394 +0000

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