OSDN Git Service

am 6b2c56a2: Merge "DO NOT MERGE Do not kill sockets going default->hipri" into ginge...
authorRobert Greenwalt <robdroid@android.com>
Wed, 18 Aug 2010 22:14:31 +0000 (15:14 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 18 Aug 2010 22:14:31 +0000 (15:14 -0700)
commit00b4ee02342bb21684e87c623c0e1a9723a2bd86
tree2ef0e352d05ac13a3098d5be2b9decfa355a8f91
parentc17d9867d985e96139b6b6ba7b5511b5647134b1
parent3b746459454833f327355e286cb84da0d70f0f1d
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