OSDN Git Service

am 76625fec: (-s ours) am 0bdf1aab: (-s ours) Merge "Import translations. DO NOT...
authorGeoff Mendal <mendal@google.com>
Mon, 1 Jun 2015 15:25:20 +0000 (15:25 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 1 Jun 2015 15:25:20 +0000 (15:25 +0000)
* commit '76625fec224a0fffa0664060f72d6cc1a7e9ba49':
  Import translations. DO NOT MERGE


Trivial merge