| commit | 2a95157fbba1f9645888ba260175926f41c310bf | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Fri Feb 05 08:50:14 2010 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Feb 05 08:50:14 2010 -0800 |
| tree | d17ad402adaf1d6a21de1ca303ef27c97dbba80d | |
| parent | 1cc593f726932b7f147a132267128a2b6da50dfd [diff] | |
| parent | 58a011744d4ec233d80221c3c211854fa58435c4 [diff] |
am 58a01174: reconcile main tree with open-source eclair Merge commit '58a011744d4ec233d80221c3c211854fa58435c4' into eclair-plus-aosp * commit '58a011744d4ec233d80221c3c211854fa58435c4': android-2.1_r1 snapshot