| commit | 4600139173c80db4ebfb70e2417231e9678d37f9 | [log] [tgz] |
|---|---|---|
| author | Robert Greenwalt <robdroid@android.com> | Wed Aug 18 15:14:31 2010 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Aug 18 15:14:31 2010 -0700 |
| tree | 1acc7e7c38b6742187ddd6ce3ebb2660ef563ff4 | |
| parent | cf2c68c9c21b8af62e95374312355d22ed55e586 [diff] | |
| parent | 6b2c56a299eb05deef2b887549e29e9e9f0f2cf6 [diff] |
am 6b2c56a2: Merge "DO NOT MERGE Do not kill sockets going default->hipri" into gingerbread Merge commit '6b2c56a299eb05deef2b887549e29e9e9f0f2cf6' into gingerbread-plus-aosp * commit '6b2c56a299eb05deef2b887549e29e9e9f0f2cf6': DO NOT MERGE Do not kill sockets going default->hipri