OSDN Git Service

Merge "Import translations. DO NOT MERGE" into nyc-dev
authorBill Yi <byi@google.com>
Fri, 5 Aug 2016 18:29:01 +0000 (18:29 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 5 Aug 2016 18:29:01 +0000 (18:29 +0000)
commit86ce04b6e0242b16c5c7b756a0bcfb0539e79667
tree40ee0e5ec2fae982ab876385527b44b450ae85d4
parentda3f395420e2fa73c4ba81f20b480222da80b36b
parentaa97eb008e3a21b42b2d7a554151544f73e7685c
Merge "Import translations. DO NOT MERGE" into nyc-dev
am: aa97eb008e  -s ours

Change-Id: I6ca238a1467cf11050f28a8254beba786148b830