| commit | 00b4ee02342bb21684e87c623c0e1a9723a2bd86 | [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 | 2ef0e352d05ac13a3098d5be2b9decfa355a8f91 | |
| parent | c17d9867d985e96139b6b6ba7b5511b5647134b1 [diff] | |
| parent | 3b746459454833f327355e286cb84da0d70f0f1d [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