| commit | 7245a0dc1596548ca2493bdb4eb00fd62994ea03 | [log] [tgz] |
|---|---|---|
| author | Eric Fischer <enf@google.com> | Tue Nov 17 07:36:07 2009 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Nov 17 07:36:07 2009 -0800 |
| tree | 57cadcc0a7f3385ca9b421130f51bb99a4b57eeb | |
| parent | d10aa77acaaa0d095d41da5d00b98367bc6ef095 [diff] | |
| parent | dd0279d592788cfa0d88398c0d946c34a3affa37 [diff] |
am dd0279d5: am 95b2e5f9: am 46979a81: (-s ours) Merge change I37f3fff6 into eclair Merge commit 'dd0279d592788cfa0d88398c0d946c34a3affa37' * commit 'dd0279d592788cfa0d88398c0d946c34a3affa37':