tree 7667b9535a0f4d95d755f2e544182f04e9993879
parent 499b45a3597bc2434bcc0974660470192ab4ff06
parent 3549b0dc2829184f9911d27a6ab0cf39b19764f1
author Brad Fitzpatrick <bradfitz@android.com> 1300906669 -0700
committer Android Code Review <code-review@android.com> 1300906669 -0700

Merge changes Icdefb5ff,Icd7f5f03

* changes:
  Fix potential race introduced in Icd7f5f03
  SocketClient: add optional reference counting