commit | b64cc4df1a73bf543e396307096763c15a4797d3 | [log] [tgz] |
---|---|---|
author | Andy McFadden <fadden@android.com> | Fri Oct 30 11:03:55 2009 -0700 |
committer | Android Git Automerger <android-git-automerger@android.com> | Fri Oct 30 11:03:55 2009 -0700 |
tree | b19d660e7cd0e52fc3d90669169105dfc5201424 | |
parent | 755e2eb3aa445dbe2dcc3bf459e0a98872b21a50 [diff] | |
parent | b00e33d1155464c640cd1f5e395b7cb315a00ccc [diff] |
am 4d0bf120: (-s ours) Merge change I08c19bee into eclair Merge commit '4d0bf1201edd3dd8da5b9f07379336390bd234fe' into eclair-mr2 * commit '4d0bf1201edd3dd8da5b9f07379336390bd234fe': DO NOT MERGE: Another gcc 4.0.3 workaround.