OSDN Git Service

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

* commit '13b99f9dbd230a85c3b47e3e52da7c740c2d0d0e':
  Import translations. DO NOT MERGE


Trivial merge