OSDN Git Service

Merge "Import translations. DO NOT MERGE" into nyc-dev
authorBill Yi <byi@google.com>
Mon, 9 May 2016 18:29:41 +0000 (18:29 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 9 May 2016 18:29:41 +0000 (18:29 +0000)
commit3bb61fec65643f7d686975b228bb67fd6d47a328
treeb919464a8889edff1fe4b74a30e6bda6a7f5adf3
parent4a36e0b3fccb9ebf29582aa1eb22ba47078540ae
parent43a4e5f4eaae8a3c886a7f9e66707f8253fecfdb
Merge "Import translations. DO NOT MERGE" into nyc-dev
am: 43a4e5f4ea  -s ours

* commit '43a4e5f4eaae8a3c886a7f9e66707f8253fecfdb':
  Import translations. DO NOT MERGE

Change-Id: I769df4f22077bfe74817edace2cd20cb51bc200d