OSDN Git Service

Merge "Import translations. DO NOT MERGE" into nyc-dev am: ef2989920d -s ours
authorBill Yi <byi@google.com>
Fri, 3 Jun 2016 17:31:41 +0000 (17:31 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 3 Jun 2016 17:31:41 +0000 (17:31 +0000)
commit4a786994bc87957a2b25baae9e8c1c5d89d87273
tree277720002bc21c9948a2146196c64f5c66b4d49a
parent1a4e544ab9b9017421db7a032bb543c3070c8d7c
parent5346695e1dffebe8461ef9e2c005e6d595eefea3
Merge "Import translations. DO NOT MERGE" into nyc-dev am: ef2989920d  -s ours
am: 5346695e1d  -s ours

* commit '5346695e1dffebe8461ef9e2c005e6d595eefea3':

Change-Id: I0b804d6784edca40349c7a593235fe4b01e62956