OSDN Git Service

Merge \"Import translations. DO NOT MERGE\" into nyc-mr1-dev
authorBill Yi <byi@google.com>
Thu, 14 Jul 2016 20:31:54 +0000 (20:31 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 14 Jul 2016 20:31:54 +0000 (20:31 +0000)
commite9de42ac9c18a4319aa8b29750c7a526364fa964
tree1e898a52e76cc791888d1cd1a5aeba21a2c44dde
parenta98d09462a91af79d121d3359df20ed8ac3ce61d
parenta035048d358b99b129c428c326f06cbbb50fef2f
Merge \"Import translations. DO NOT MERGE\" into nyc-mr1-dev
am: a035048d35  -s ours

Change-Id: I233dad03d066fea8fd951247360e687f4c2ae84c