| commit | 1cced96502fc2e45b942c509059e31b3a5795179 | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Fri Feb 05 14:16:18 2010 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Feb 05 14:16:18 2010 -0800 |
| tree | b4f8fa773978e58a60171ea2efbd931ec79d13e6 | |
| parent | b2892a9bbecc956701640ee3828950d84a6cb57c [diff] | |
| parent | 30e270dc12d8ca72dd66947ec8f67208b4a0aae8 [diff] |
am 30e270dc: am f7a73024: reconcile main tree with open-source eclair Merge commit '30e270dc12d8ca72dd66947ec8f67208b4a0aae8' * commit '30e270dc12d8ca72dd66947ec8f67208b4a0aae8': android-2.1_r1 snapshot