OSDN Git Service

Merge "Import translations. DO NOT MERGE" into nyc-dev
authorGeoff Mendal <mendal@google.com>
Wed, 23 Mar 2016 14:49:29 +0000 (14:49 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 23 Mar 2016 14:49:29 +0000 (14:49 +0000)
am: df1e2b1  -s ours

* commit 'df1e2b1457690ccbd1302078cedafbfbb8918265':
  Import translations. DO NOT MERGE


Trivial merge