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:36:45 +0000 (18:36 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 9 May 2016 18:36:45 +0000 (18:36 +0000)
commit424103ed15f40993792af786af71171034196e42
tree5fe2188b24d41216f65174e977d9239a58cc7df8
parentc86d7e5e92b4cc418bb21585712f9d23dcc4cda8
parent7cebc5dbda02c5969c2039f0f64db60c4b350839
Merge "Import translations. DO NOT MERGE" into nyc-dev am: 43a4e5f4ea  -s ours
am: 7cebc5dbda  -s ours

* commit '7cebc5dbda02c5969c2039f0f64db60c4b350839':

Change-Id: Ied6fcfc4440020abaf09421279f3076e17c57cd4