| commit | 1d03be23cf5f359223177883a7e6bc3dc41312fa | [log] [tgz] |
|---|---|---|
| author | Mike Reed <reed@google.com> | Thu Oct 29 02:02:33 2009 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Oct 29 02:02:33 2009 -0700 |
| tree | 67939c2decb55d5515001cbd6cef13a056438733 | |
| parent | f267b947657a3c057d15650a39b98e7b2129bc70 [diff] | |
| parent | 9a6cf150480f97a4d14f64c05a7353bc16b2c5db [diff] |
am 9a6cf150: (-s ours) am a01dc0fc: am 2dfaa698: (-s ours) Merge change I882d2eb8 into eclair Merge commit '9a6cf150480f97a4d14f64c05a7353bc16b2c5db' * commit '9a6cf150480f97a4d14f64c05a7353bc16b2c5db': do not merge