| commit | f35837d93b6de994551e71672ad65405b2972adf | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Fri Feb 05 14:13:05 2010 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Feb 05 14:13:05 2010 -0800 |
| tree | 242917d13f3614f94d07a4de2265c4a21660e269 | |
| parent | 4dd03683cf5c405c49ebf76181d82c293bae4864 [diff] | |
| parent | e4034f0e42fff82a84c8ad3321c80a96f3b9afab [diff] |
am e4034f0e: am 5b7c883d: reconcile main tree with open-source eclair Merge commit 'e4034f0e42fff82a84c8ad3321c80a96f3b9afab' * commit 'e4034f0e42fff82a84c8ad3321c80a96f3b9afab': android-2.1_r1 snapshot