OSDN Git Service

Merge "Import translations. DO NOT MERGE" into nyc-dev am: d5f7c20a26 -s ours
authorBill Yi <byi@google.com>
Fri, 27 May 2016 04:19:37 +0000 (04:19 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 27 May 2016 04:19:37 +0000 (04:19 +0000)
commit3bef07780b92550bc7e5c4975ef4c0bcf91d9a72
tree0c7292ea873f1a2eb5c81503c3af9e13b8caae24
parent247697277ab49e9a1eeff48db0f20381fc66d57e
parent4422014febeaa68768e8256cfa6e3560e4a166da
Merge "Import translations. DO NOT MERGE" into nyc-dev am: d5f7c20a26  -s ours
am: 4422014feb  -s ours

* commit '4422014febeaa68768e8256cfa6e3560e4a166da':

Change-Id: Ic55f28a5fac46ae170113ff127e22031ad32dfd4