| commit | 02797369a90d032b6860f91ad3add2f810efd66f | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Fri Feb 05 08:43:51 2010 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Feb 05 08:43:51 2010 -0800 |
| tree | 9435c01377dae1a21343d2db4e5decec0b73abd6 | |
| parent | fe4529657f45f54285f6a045cefff262a8926dde [diff] | |
| parent | 4c97c59e3855f7766c25476f75a3b5b05ce54a9f [diff] |
am 4c97c59e: reconcile main tree with open-source eclair Merge commit '4c97c59e3855f7766c25476f75a3b5b05ce54a9f' into eclair-plus-aosp * commit '4c97c59e3855f7766c25476f75a3b5b05ce54a9f': android-2.1_r1 snapshot