OSDN Git Service

am 51aedf86: (-s ours) Import translations. DO NOT MERGE
authorGeoff Mendal <mendal@google.com>
Wed, 7 Jan 2015 14:29:23 +0000 (14:29 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 7 Jan 2015 14:29:23 +0000 (14:29 +0000)
* commit '51aedf86037f027898ec279befe869c80ef9730c':
  Import translations. DO NOT MERGE


Trivial merge