OSDN Git Service

(root) / android-x86 / packages-apps-Contacts.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 9b241b1 4c129c9)
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)
Merge commit '4c129c92cb8f7f4d2a1f5dcf69a7564d5c88fd9f' into eclair-mr2

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


Trivial merge
packages/apps/Contacts
About OSDN
Find Software
Develop Software
Help