| commit | 2c6a1cc23c90090cefb61dd5f55e4859183b64b9 | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Fri Feb 05 08:50:10 2010 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Feb 05 08:50:10 2010 -0800 |
| tree | 8c7b51a78205a9a448dec9a8212b907e24fe700c | |
| parent | b49790ec96bb654ed21f4cef85c7db4999c1bed4 [diff] | |
| parent | 1ef854812c4f087d9a83f4c6262a206846ff3bfb [diff] |
am 1ef85481: reconcile main tree with open-source eclair Merge commit '1ef854812c4f087d9a83f4c6262a206846ff3bfb' into eclair-plus-aosp * commit '1ef854812c4f087d9a83f4c6262a206846ff3bfb': android-2.1_r1 snapshot