OSDN Git Service

Merge \"Import translations. DO NOT MERGE\" into nyc-dev
authorBill Yi <byi@google.com>
Tue, 21 Jun 2016 17:08:19 +0000 (17:08 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 21 Jun 2016 17:08:19 +0000 (17:08 +0000)
commit3e8b479eeffccf53a92164318c69b0d5b726dc5f
treef6dd43446e1e524c2c1a2cd558cb1c1ed81a19be
parent4d0beea6771023701d7c3ad48429b7348c5f4d2e
parent284a71ecd63cbeefcfe6736961b51eb9e6f62bb5
Merge \"Import translations. DO NOT MERGE\" into nyc-dev
am: 284a71ecd6  -s ours

Change-Id: I2fa02988a5341ac04c96f87389195349e71cc83d