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)
Merge commit '5858728f96d80ea6042912ad763067d6c0326fb3' into eclair-mr2-plus-aosp

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


Trivial merge