tree 7947c7a64dc54dde57e601933b2e755903766729
parent 3a82ab0e920c58cb19dd5af32d6f5c85a7d640dd
parent 2f4fa529bec709d1240c82fc1ff5af3409e113cf
author Bill Yi <byi@google.com> 1460210423 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1460210425 +0000

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