OSDN Git Service

am ef42883d: (-s ours) am ebfadc7f: Merge "Import translations. DO NOT MERGE" into...
authorBaligh Uddin <baligh@google.com>
Tue, 30 Apr 2013 23:45:26 +0000 (16:45 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 30 Apr 2013 23:45:26 +0000 (16:45 -0700)
* commit 'ef42883d409fa06279436945deaff40f2b7fe8b9':
  Import translations. DO NOT MERGE


Trivial merge