OSDN Git Service

am eb8e9c11: (-s ours) am 2c766ba5: Import translations. DO NOT MERGE
authorBaligh Uddin <baligh@google.com>
Wed, 8 May 2013 22:04:41 +0000 (15:04 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 8 May 2013 22:04:41 +0000 (15:04 -0700)
* commit 'eb8e9c11ede066a7b28c51b3492ce7253304cb5b':
  Import translations. DO NOT MERGE


Trivial merge