tree bcfb51d9af7f200b59c92a59316d1b7be7964e75
parent 1be5477dbe37b940d1269af9b188f7150fad2497
parent 60e532a47f06d9017634e1c410a34fe7d5fd1070
author Geoff Mendal <mendal@google.com> 1459175578 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1459175580 +0000

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