OSDN Git Service

Merge change I7b9328c7 into eclair
authorAndroid (Google) Code Review <android-gerrit@google.com>
Thu, 3 Dec 2009 02:51:19 +0000 (18:51 -0800)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Thu, 3 Dec 2009 02:51:19 +0000 (18:51 -0800)
commitdcd58cfda366c915b1f0739cb115f9d972351c73
tree9ef9275a3de8ae6c516a471c89fcb57c1478fc47
parent7dfecb86db7c3c08a0fb0f6c6b06a11eabc60c54
parent709d6db48d11974a6a05df424221748b4dfafb59
Merge change I7b9328c7 into eclair

* changes:
  Fix issue #2300232: Bugs in resolving conflicting pointers