OSDN Git Service

am 4c129c92: Increment tries as we reparent to avoid looping.
authorJeff Sharkey <jsharkey@android.com>
Thu, 8 Oct 2009 16:01:53 +0000 (09:01 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 8 Oct 2009 16:01:53 +0000 (09:01 -0700)
commit5858728f96d80ea6042912ad763067d6c0326fb3
treee0dbf7ef8b33174d9514efd000b4aa27ea411c97
parent9b241b1b1b3ac0600cac084021f431b1b09f9944
parent4c129c92cb8f7f4d2a1f5dcf69a7564d5c88fd9f
am 4c129c92: Increment tries as we reparent to avoid looping.

Merge commit '4c129c92cb8f7f4d2a1f5dcf69a7564d5c88fd9f' into eclair-mr2

* commit '4c129c92cb8f7f4d2a1f5dcf69a7564d5c88fd9f':
  Increment tries as we reparent to avoid looping.