OSDN Git Service

am 4fe6117c: (-s ours) am 26310772: (-s ours) Import translations. DO NOT MERGE
authorGeoff Mendal <mendal@google.com>
Mon, 12 Jan 2015 16:40:27 +0000 (16:40 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 12 Jan 2015 16:40:27 +0000 (16:40 +0000)
* commit '4fe6117cc1ce411dbbcfc1b25dc1ef720901ad4b':
  Import translations. DO NOT MERGE


Trivial merge