| commit | 86c579d616c169d3a10e81156bd69d97c5761fd4 | [log] [tgz] |
|---|---|---|
| author | Bart Sears <bsears@google.com> | Wed Feb 10 09:24:14 2010 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Feb 10 09:24:14 2010 -0800 |
| tree | 0f069b346cb6104a760902f0b38862e3e24d293e | |
| parent | 2cf0be3a1ebefd717ae6872ccd7d3d46e1b1b8ad [diff] | |
| parent | b913443da437b737a9a9551bcc2f0f7a66844c11 [diff] |
am 789b11c7: (-s ours) am 926780b0: Merge "DO NOT MERGE" into eclair Merge commit '789b11c715af48a0379b8b1f90d7a829ac6a8145' * commit '789b11c715af48a0379b8b1f90d7a829ac6a8145': DO NOT MERGE