OSDN Git Service

Merge "Import translations. DO NOT MERGE" into nyc-dev am: 43a4e5f4ea -s ours
authorBill Yi <byi@google.com>
Mon, 9 May 2016 18:35:42 +0000 (18:35 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 9 May 2016 18:35:42 +0000 (18:35 +0000)
commitc86d7e5e92b4cc418bb21585712f9d23dcc4cda8
tree5fe2188b24d41216f65174e977d9239a58cc7df8
parent8805cb80bbaf7a0008689bee2777f881947c4b8c
parent3bb61fec65643f7d686975b228bb67fd6d47a328
Merge "Import translations. DO NOT MERGE" into nyc-dev am: 43a4e5f4ea  -s ours
am: 3bb61fec65  -s ours

* commit '3bb61fec65643f7d686975b228bb67fd6d47a328':
  Import translations. DO NOT MERGE

Change-Id: I1ba1290fd79d538a77c599c1b55404ac4c4689c0