| commit | 221cb2a6ca8a187fbe35f465df640a68ed2feaed | [log] [tgz] |
|---|---|---|
| author | Mike Reed <reed@google.com> | Mon Jan 25 18:12:08 2010 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Jan 25 18:12:08 2010 -0800 |
| tree | daa4ac1e89ac6f4d13490072c16497b358a835f6 | |
| parent | cda4d7bea26709bb735aaace474d1dfe82833c9c [diff] | |
| parent | 6dc9232c1c9a7ddffba24d4bd218e46894f8414d [diff] |
am 6dc9232c: (-s ours) am a66baccc: Merge "Do not merge" into eclair Merge commit '6dc9232c1c9a7ddffba24d4bd218e46894f8414d' * commit '6dc9232c1c9a7ddffba24d4bd218e46894f8414d': Do not merge