| commit | 1c54c076eba6e12789da6f32b789dba9dfdf2b24 | [log] [tgz] |
|---|---|---|
| author | Mike Reed <reed@google.com> | Mon Jan 25 06:03:30 2010 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Jan 25 06:03:30 2010 -0800 |
| tree | bed32393c104a296796ae56c4d822953d14f9eeb | |
| parent | 111d0367d75e0bba6558e4464a7662dc95825ba4 [diff] | |
| parent | 70660425c03ac9688d749b13b48bba24d22efabf [diff] |
am 70660425: (-s ours) am 9f954cf2: Merge "Do not merge" into eclair Merge commit '70660425c03ac9688d749b13b48bba24d22efabf' * commit '70660425c03ac9688d749b13b48bba24d22efabf': Do not merge