| commit | fa8440c3ac47963fc7b34584123220f25a3a8a9e | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Fri Feb 05 14:10:42 2010 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Feb 05 14:10:42 2010 -0800 |
| tree | f282720659a85224f6d4e752a68f0786f697bf28 | |
| parent | dbcdeda6a33b3ca0cf9ca8288dd87053e83eae48 [diff] | |
| parent | 62cf0ad5bcb18bc85f17b30296882b109b05b290 [diff] |
am 62cf0ad5: am 2306a400: reconcile main tree with open-source eclair Merge commit '62cf0ad5bcb18bc85f17b30296882b109b05b290' * commit '62cf0ad5bcb18bc85f17b30296882b109b05b290': android-2.1_r1 snapshot