| commit | 269bf92fadf94e75562e0c4cc542ea7e594d62bd | [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 | cbe1d9215e97c165c17903c43e93d49ad9327e79 | |
| parent | ef67e0dd0ed6b31dcdba2215576c7291ee696236 [diff] | |
| parent | a584cbe32f6f9ac19b78f47c4b2c56a724433feb [diff] |
am dcd58cfd: Merge change I7b9328c7 into eclair Merge commit 'dcd58cfda366c915b1f0739cb115f9d972351c73' into eclair-mr2 * commit 'dcd58cfda366c915b1f0739cb115f9d972351c73': Fix issue #2300232: Bugs in resolving conflicting pointers