OSDN Git Service

Merge \"Import translations. DO NOT MERGE\" into nyc-dev
authorBaligh Uddin <baligh@google.com>
Wed, 8 Jun 2016 13:10:58 +0000 (13:10 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 8 Jun 2016 13:10:58 +0000 (13:10 +0000)
commit10b388fe9acbafdaa133db7c3f08c0caba10a194
treeca1470972233cd82ad567d8b1f7dd3ec2e2b82d3
parentfde831f55d06d5ec524ee542866295879a98e2cb
parentc20ea2eb438a47bc0590f046d5765ad3b32b80c7
Merge \"Import translations. DO NOT MERGE\" into nyc-dev
am: c20ea2eb43  -s ours

Change-Id: I4a393b6c0902a3923ca776ba4f8515993bcb2672