OSDN Git Service

am aadfde91: (-s ours) am 1ecee6c1: (-s ours) please do not merge again; This reverts...
authorEd Heyl <edheyl@google.com>
Thu, 20 Aug 2009 23:56:08 +0000 (16:56 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 20 Aug 2009 23:56:08 +0000 (16:56 -0700)
Merge commit 'aadfde911002f4b4390cd56fd74bb2fc9a6f30bc'

* commit 'aadfde911002f4b4390cd56fd74bb2fc9a6f30bc':
  please do not merge again; This reverts commit 8d58816a7f2cf3b4de4c1932bbde39be7a489b82


Trivial merge