OSDN Git Service

Merge "Import translations. DO NOT MERGE" into nyc-dev am: 2b92ce7aaa -s ours
authorBill Yi <byi@google.com>
Tue, 7 Jun 2016 03:25:44 +0000 (03:25 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 7 Jun 2016 03:25:44 +0000 (03:25 +0000)
am: 0118fbd3ef  -s ours

* commit '0118fbd3ef557461ab4725a06eb9064d622cf88f':
  Import translations. DO NOT MERGE

Change-Id: Icf798098101b876a050d56dedfb417e27b742971


Trivial merge