| commit | 8e24c43e237593a461d4a6a09b665b0429f7bbd4 | [log] [tgz] |
|---|---|---|
| author | Robert Greenwalt <robdroid@android.com> | Sat Aug 21 09:33:42 2010 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Sat Aug 21 09:33:42 2010 -0700 |
| tree | 1ebae7cc207d419938c646ee017ed2cbc07447b7 | |
| parent | 84f62aeb619781c331d8d1e08d57f88172480efc [diff] | |
| parent | 00b4ee02342bb21684e87c623c0e1a9723a2bd86 [diff] |
am 46001391: (-s ours) am 6b2c56a2: Merge "DO NOT MERGE Do not kill sockets going default->hipri" into gingerbread Merge commit '4600139173c80db4ebfb70e2417231e9678d37f9' * commit '4600139173c80db4ebfb70e2417231e9678d37f9': DO NOT MERGE Do not kill sockets going default->hipri