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)
commit8ae0f5562ae79fed534f12c340fdff7114c12c38
treec4acc6eecf6e65fcbc6c1439fec5d1c23190053e
parent87f685560f302ec511781b2f1b688600e7ecc5fd
parent4ab3045755d33ab24bd312cfbc888f300c5e01f9
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