OSDN Git Service

Merge "Import translations. DO NOT MERGE" into nyc-dev am: 4316b8a -s ours
authorBill Yi <byi@google.com>
Mon, 25 Apr 2016 15:27:01 +0000 (15:27 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 25 Apr 2016 15:27:01 +0000 (15:27 +0000)
commit18ea64bca41f682d129abc939f84c02d3c637971
treeed69da0ea435ffa905f235fd97050587b04356f9
parent0ae03ae8a9f1273120a7bfe39f171b8ba7f72497
parent2983b837fad0f3573e38522a7ebdce4b76543f8d
Merge "Import translations. DO NOT MERGE" into nyc-dev am: 4316b8a  -s ours
am: 2983b83  -s ours

* commit '2983b837fad0f3573e38522a7ebdce4b76543f8d':

Change-Id: I0978be5ef9d6f23499170fb6a493886aad5d6026