OSDN Git Service

Merge "Import translations. DO NOT MERGE" into nyc-dev am: 90edb46 -s ours
authorBill Yi <byi@google.com>
Mon, 25 Apr 2016 13:05:02 +0000 (13:05 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 25 Apr 2016 13:05:02 +0000 (13:05 +0000)
commit3595fd70fcea400116d1f0d50d324762a94b0caa
tree1debaa245064cd7f0be68b52b76d0232f29f88ac
parent30e23079f3b73a935d2de17bffae01af8ee6a2aa
parent67aa5e68b0357d96c3b588c6a9ad37a073e20d1d
Merge "Import translations. DO NOT MERGE" into nyc-dev am: 90edb46  -s ours
am: 67aa5e6  -s ours

* commit '67aa5e68b0357d96c3b588c6a9ad37a073e20d1d':

Change-Id: I956bdfc597e80a34f5fcdd92361fa55606fc5cfe