| commit | 3836ef8d2d0d10ada4e64d4ed9c5a492e5142409 | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Fri Feb 05 14:16:40 2010 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Feb 05 14:16:40 2010 -0800 |
| tree | 1d05e571a50d193f44ce6ff1fb4694d39599abb7 | |
| parent | 0a68310c0fa5fb00d5f243cb3d8ca5ee2bedd946 [diff] | |
| parent | 407770b1bf4b8eb2e254ee24a2667e5302088c12 [diff] |
am 407770b1: am b08657bd: reconcile main tree with open-source eclair Merge commit '407770b1bf4b8eb2e254ee24a2667e5302088c12' * commit '407770b1bf4b8eb2e254ee24a2667e5302088c12': android-2.1_r1 snapshot