OSDN Git Service

Merge "Import translations. DO NOT MERGE" into nyc-dev
authorGeoff Mendal <mendal@google.com>
Mon, 8 Feb 2016 19:02:24 +0000 (19:02 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 8 Feb 2016 19:02:24 +0000 (19:02 +0000)
am: 0f6b093db7  -s ours

* commit '0f6b093db74fc4b1b914b1d7b301f9e841184ffe':
  Import translations. DO NOT MERGE


Trivial merge