From: Jeff Sharkey <jsharkey@android.com>
Date: Thu, 8 Oct 2009 16:07:09 +0000 (-0700)
Subject: am 5858728f: am 4c129c92: Increment tries as we reparent to avoid looping.
X-Git-Tag: android-x86-2.2~176^2~87
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=085cde2aad73394739dbe98cf2517c5a9691ba57;p=android-x86%2Fpackages-apps-Contacts.git

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.
---

085cde2aad73394739dbe98cf2517c5a9691ba57