OSDN Git Service

Merge "Import translations. DO NOT MERGE" into nyc-dev am: 3d9d9fa0d9 -s ours
authorBill Yi <byi@google.com>
Fri, 3 Jun 2016 17:31:33 +0000 (17:31 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 3 Jun 2016 17:31:33 +0000 (17:31 +0000)
commit1a4e544ab9b9017421db7a032bb543c3070c8d7c
tree277720002bc21c9948a2146196c64f5c66b4d49a
parent9e14fb3c6733bdad087eb3fab7913f612e363bb7
parenta1ba60ce290894003a164a5e08d46a50f323532b
Merge "Import translations. DO NOT MERGE" into nyc-dev am: 3d9d9fa0d9  -s ours
am: a1ba60ce29  -s ours

* commit 'a1ba60ce290894003a164a5e08d46a50f323532b':

Change-Id: I2c15fa3c3ee3ff7492b2c809d734866f8cac4e11