OSDN Git Service

Merge \"Import translations. DO NOT MERGE\" into nyc-dev
authorBill Yi <byi@google.com>
Tue, 14 Jun 2016 12:06:33 +0000 (12:06 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 14 Jun 2016 12:06:33 +0000 (12:06 +0000)
commit960a0a8fec63661389c15b57450168e1fe9772fd
treeaf22c2a4197ec4869090c774dd5f39513dbfc44d
parent7c1a615cf413be5c2948f8f4ffe96541be03007b
parentbb8b32262f803a3cc273edb57881fcbc328ba186
Merge \"Import translations. DO NOT MERGE\" into nyc-dev
am: bb8b32262f  -s ours

Change-Id: Ie868e30032e9dc633bd2205413704d30801fd815