tree 688f2890219bb5f3a2cf50fe07c49d4f4d493ef4
parent 5558f89b14af81d38364afe9e51a56f8557fd282
parent 84b56aaeae173fd448b12c0bf33286a8818143e2
author Bill Yi <byi@google.com> 1457719532 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1457719533 +0000

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