tree 40ee0e5ec2fae982ab876385527b44b450ae85d4
parent 6b1d586689b224ecc75f0050903d8cbbb6df146d
parent c92d3711042f6317fe11985ac9199a637708bbe3
author Bill Yi <byi@google.com> 1470421368 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1470421369 +0000

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