OSDN Git Service

Merge "DO NOT MERGE Do not kill sockets going default->hipri" into gingerbread
authorRobert Greenwalt <robdroid@android.com>
Wed, 18 Aug 2010 22:11:52 +0000 (15:11 -0700)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Wed, 18 Aug 2010 22:11:52 +0000 (15:11 -0700)

Trivial merge