OSDN Git Service

am cb1e616e: am 7c556549: Merge changes Icdefb5ff,Icd7f5f03
authorBrad Fitzpatrick <bradfitz@android.com>
Tue, 29 Mar 2011 15:45:04 +0000 (08:45 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 29 Mar 2011 15:45:04 +0000 (08:45 -0700)
commit4fecade5f21d5d062ebe1c70535367d3407bb68f
tree8997c814b16a593c8915a36e5f3e0d2db430bfec
parent15b15c4b4acede0b999e6a7af9ce797c6a58a62a
parentcb1e616e3c108a9c8b159bb95c3356acf5797ba2
am cb1e616e: am 7c556549: Merge changes Icdefb5ff,Icd7f5f03

* commit 'cb1e616e3c108a9c8b159bb95c3356acf5797ba2':
  Fix potential race introduced in Icd7f5f03
  SocketClient: add optional reference counting