OSDN Git Service

Merge "Import translations. DO NOT MERGE" into nyc-dev am: 3496262 -s ours am: 54d46...
authorBill Yi <byi@google.com>
Mon, 25 Apr 2016 15:37:39 +0000 (15:37 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 25 Apr 2016 15:37:39 +0000 (15:37 +0000)
commit938285d82d413d3fa2246609a14c75e1fa29d5b5
tree45112cd50c1e6f3b0b2d817725e9de3a049a7a32
parent45e81980604e49b64d73b33e9f8653a4f3f93d8a
parent1a77769a495de082ac84fbf1c7a90e033b0d7df1
Merge "Import translations. DO NOT MERGE" into nyc-dev am: 3496262  -s ours am: 54d4693  -s ours
am: 1a77769  -s ours

* commit '1a77769a495de082ac84fbf1c7a90e033b0d7df1':

Change-Id: Idb4077f150105d9f5a9ceeaf9a80d82a3b08a1ac