OSDN Git Service

Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
authorBill Yi <byi@google.com>
Mon, 9 May 2016 18:28:26 +0000 (18:28 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 9 May 2016 18:28:26 +0000 (18:28 +0000)
commit8805cb80bbaf7a0008689bee2777f881947c4b8c
tree5fe2188b24d41216f65174e977d9239a58cc7df8
parent30b6336d3a69842ef5a12c022a7bfa8aa2b31eb1
parent4e5641bfa8a27bbcd377e68e2d52d163ddec3011
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
am: 4e5641bfa8  -s ours

* commit '4e5641bfa8a27bbcd377e68e2d52d163ddec3011':
  Import translations. DO NOT MERGE

Change-Id: I861e2d9156422593779e301b24809bde271d28f5