| commit | f925cb322e693ce2e621dbad3fd1eb8579878710 | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Fri Feb 05 08:43:41 2010 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Feb 05 08:43:41 2010 -0800 |
| tree | ec412b6a7c8a5befe94441a403c6266ac9ef282e | |
| parent | 20d93db18de9001dcb5af46e4d1d2bac10aa2eca [diff] | |
| parent | 97233468715838e42b98abe047c60e108fcc44bd [diff] |
am 97233468: reconcile main tree with open-source eclair Merge commit '97233468715838e42b98abe047c60e108fcc44bd' into eclair-plus-aosp * commit '97233468715838e42b98abe047c60e108fcc44bd': (198 commits) android-2.1_r1 snapshot ERD79 ERD78 ERD77D ERD77C ERD77B ERD77 ERD76 ERD75 ERD72 ERD71F ERD71E ERD71D ERD71C ERD71B ERD71 ERD70B ERD70 ERD69 ERD68B ...