| commit | 1dde14bc84e39b81df7108a2d64a7918a97b20df | [log] [tgz] |
|---|---|---|
| author | Dianne Hackborn <hackbod@google.com> | Wed Dec 02 19:01:31 2009 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Dec 02 19:01:31 2009 -0800 |
| tree | 359810ddddad7bf61bea0b17e7c6345de7bb66b2 | |
| parent | 15620b1eef1ab1f42c7fbcbfce1f54e0c205df1b [diff] | |
| parent | a45e925108f6c9d35d9e7b5e8def9aba49ee0dba [diff] |
am a45e9251: am dcd58cfd: Merge change I7b9328c7 into eclair Merge commit 'a45e925108f6c9d35d9e7b5e8def9aba49ee0dba' into eclair-mr2-plus-aosp * commit 'a45e925108f6c9d35d9e7b5e8def9aba49ee0dba': Fix issue #2300232: Bugs in resolving conflicting pointers