OSDN Git Service

am 5858728f: am 4c129c92: Increment tries as we reparent to avoid looping.
authorJeff Sharkey <jsharkey@android.com>
Thu, 8 Oct 2009 16:07:09 +0000 (09:07 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 8 Oct 2009 16:07:09 +0000 (09:07 -0700)
commit085cde2aad73394739dbe98cf2517c5a9691ba57
treee0dbf7ef8b33174d9514efd000b4aa27ea411c97
parent9dd267d438edf2858ab8cb85e117c359d2538517
parent5858728f96d80ea6042912ad763067d6c0326fb3
am 5858728f: am 4c129c92: Increment tries as we reparent to avoid looping.

Merge commit '5858728f96d80ea6042912ad763067d6c0326fb3' into eclair-mr2-plus-aosp

* commit '5858728f96d80ea6042912ad763067d6c0326fb3':
  Increment tries as we reparent to avoid looping.