OSDN Git Service

am 5d42075e: Merge "DO NOT MERGE: Instead of asserting, remove active streams if...
authorAndreas Huber <andih@google.com>
Fri, 11 Nov 2011 19:47:58 +0000 (11:47 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 11 Nov 2011 19:47:58 +0000 (11:47 -0800)
commit9a87a838028f3911a066a729cdb5ec688903a5ae
treed050451f9e03105923990264f376ef8163f2973a
parent9c981cd3d53238f10842368c1cd82d625b701a47
parent5d42075e450a49af2bb37ca3a9610921df7607f2
am 5d42075e: Merge "DO NOT MERGE: Instead of asserting, remove active streams if their sockets" into ics-mr1

* commit '5d42075e450a49af2bb37ca3a9610921df7607f2':
  DO NOT MERGE: Instead of asserting, remove active streams if their sockets