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