| commit | 67f2a983f339778f851a8303a5ceb6176f760d6f | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Fri Feb 05 14:22:00 2010 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Feb 05 14:22:00 2010 -0800 |
| tree | 954f3bcefdf098672b2f19eab52425ac5b6be480 | |
| parent | 6d44f4898d4b5e01688e7c47489754c101fbd3f9 [diff] | |
| parent | f06baa9329f2e74453a765aeb999771696548715 [diff] |
am f06baa93: am b01d68f9: reconcile main tree with open-source eclair Merge commit 'f06baa9329f2e74453a765aeb999771696548715' * commit 'f06baa9329f2e74453a765aeb999771696548715': android-2.1_r1 snapshot