OSDN Git Service

am 5343011d: (-s ours) do not merge: cherry-picked 360742dd52ce2e67f08b219c5148577ce2...
authorSteve Block <steveblock@google.com>
Fri, 14 Aug 2009 15:53:12 +0000 (08:53 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 14 Aug 2009 15:53:12 +0000 (08:53 -0700)
commit729c55a37799a2b5a240a327f1bce348eb012f15
tree186cf537222bc7e24dff0b59bf09374027dc2529
parente631646ae9030296d7c00c2298031aa01040351d
parent5343011d8c5e322c74a78385633354ca3db92343
am 5343011d: (-s ours) do not merge: cherry-picked 360742dd52ce2e67f08b219c5148577ce2e2b741 from master branch

Merge commit '5343011d8c5e322c74a78385633354ca3db92343' into eclair-plus-aosp

* commit '5343011d8c5e322c74a78385633354ca3db92343':
  do not merge: cherry-picked 360742dd52ce2e67f08b219c5148577ce2e2b741 from master branch