OSDN Git Service

Merge "Import translations. DO NOT MERGE" into nyc-dev
authorBill Yi <byi@google.com>
Mon, 25 Apr 2016 15:15:40 +0000 (15:15 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 25 Apr 2016 15:15:40 +0000 (15:15 +0000)
commit54d4693f986e886c3baeecea559d69c8a7d91fb5
tree0b9572b2652b5fd0812ec62262bdb10bf5bcb400
parent8235995e9cdf753bac3b5fd0659886d58983f095
parent3496262a987867f90260b467c366eb7e6be42333
Merge "Import translations. DO NOT MERGE" into nyc-dev
am: 3496262  -s ours

* commit '3496262a987867f90260b467c366eb7e6be42333':
  Import translations. DO NOT MERGE

Change-Id: I3bf9e1bd1f1a66263d17b1635acb3ac2d8e91b7d