tree 7cdd903ad729525a820b48f9657072ce605438db
parent f872232b454363fd0f23b2d40dd3b0983306ad4e
parent b727d99a5e365373eb147e5e99594dcb67db3ada
author Geoff Mendal <mendal@google.com> 1454953762 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1454953762 +0000

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