tree 0b29a8a86e67df66b8a4f1dccb46633cc93eb4df
parent 471bfa78ffca4249ec38ac16c0cdbb789be45a72
parent 4fecade5f21d5d062ebe1c70535367d3407bb68f
author Brad Fitzpatrick <bradfitz@android.com> 1301413976 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1301413976 -0700

am 4fecade5: am cb1e616e: am 7c556549: Merge changes Icdefb5ff,Icd7f5f03

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