tree 40ee0e5ec2fae982ab876385527b44b450ae85d4
parent da3f395420e2fa73c4ba81f20b480222da80b36b
parent aa97eb008e3a21b42b2d7a554151544f73e7685c
author Bill Yi <byi@google.com> 1470421741 +0000
committer android-build-merger <android-build-merger@google.com> 1470421741 +0000

Merge "Import translations. DO NOT MERGE" into nyc-dev
am: aa97eb008e  -s ours

Change-Id: I6ca238a1467cf11050f28a8254beba786148b830