OSDN Git Service

am ed6bb750: (-s ours) am a7707160: Merge "Import translations. DO NOT MERGE" into...
authorBaligh Uddin <baligh@google.com>
Wed, 29 May 2013 22:21:29 +0000 (15:21 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 29 May 2013 22:21:29 +0000 (15:21 -0700)
* commit 'ed6bb750c1662cff918d157b0ea3d2ce0c7e4108':
  Import translations. DO NOT MERGE


Trivial merge