| commit | f06baa9329f2e74453a765aeb999771696548715 | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Fri Feb 05 08:47:55 2010 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Feb 05 08:47:55 2010 -0800 |
| tree | 0236d21ad6cbe6ba7cd58987727261742ac0693d | |
| parent | 0ae50e0160eb13793052587b444b532b123ebf8c [diff] | |
| parent | b01d68f911748d59ffeeee33f9be675cd882debb [diff] |
am b01d68f9: reconcile main tree with open-source eclair Merge commit 'b01d68f911748d59ffeeee33f9be675cd882debb' into eclair-plus-aosp * commit 'b01d68f911748d59ffeeee33f9be675cd882debb': android-2.1_r1 snapshot