OSDN Git Service

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

Change-Id: I3bc7c180ab44d5884292f87e57337c22f2e8110b