tree 5772ac325193cd031a5c834cb3712b9137873fec
parent 839aa9db820952cf58f5598cbdebd723310d885f
parent 52e62e55a866d42da60bff8cdca405900e02febf
author Geoff Mendal <mendal@google.com> 1454949452 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1454949452 +0000

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