| commit | a45e925108f6c9d35d9e7b5e8def9aba49ee0dba | [log] [tgz] |
|---|---|---|
| author | Dianne Hackborn <hackbod@google.com> | Wed Dec 02 18:56:20 2009 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Dec 02 18:56:20 2009 -0800 |
| tree | 34f759ed66ff8f4230209012ee6356233287cdad | |
| parent | 21eb173864670c2f759258016d95f0bcd06313e7 [diff] | |
| parent | dcd58cfda366c915b1f0739cb115f9d972351c73 [diff] |
am dcd58cfd: Merge change I7b9328c7 into eclair Merge commit 'dcd58cfda366c915b1f0739cb115f9d972351c73' into eclair-mr2 * commit 'dcd58cfda366c915b1f0739cb115f9d972351c73': Fix issue #2300232: Bugs in resolving conflicting pointers