| commit | 30e270dc12d8ca72dd66947ec8f67208b4a0aae8 | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Fri Feb 05 08:45:38 2010 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Feb 05 08:45:38 2010 -0800 |
| tree | b4f8fa773978e58a60171ea2efbd931ec79d13e6 | |
| parent | d8309af6148d6496ca6c73ed0a29ba26957d1512 [diff] | |
| parent | f7a730248fa772625f519cd6a75b1fb6b30c9101 [diff] |
am f7a73024: reconcile main tree with open-source eclair Merge commit 'f7a730248fa772625f519cd6a75b1fb6b30c9101' into eclair-plus-aosp * commit 'f7a730248fa772625f519cd6a75b1fb6b30c9101': android-2.1_r1 snapshot