OSDN Git Service

am 1ecee6c1: (-s ours) please do not merge again; This reverts commit 8d58816a7f2cf3b...
authorEd Heyl <edheyl@google.com>
Thu, 20 Aug 2009 23:52:31 +0000 (16:52 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 20 Aug 2009 23:52:31 +0000 (16:52 -0700)
commitaadfde911002f4b4390cd56fd74bb2fc9a6f30bc
tree264a6f23f74f2901bb1dbff4533162a1a41712d2
parent92bfac824ad7986239dfd830b008f595b617924e
parent1ecee6c11e40de8c9b8644a868f88bbc4ac69aec
am 1ecee6c1: (-s ours) please do not merge again; This reverts commit 8d58816a7f2cf3b4de4c1932bbde39be7a489b82

Merge commit '1ecee6c11e40de8c9b8644a868f88bbc4ac69aec' into eclair

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