aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrad Fitzpatrick <bradfitz@android.com>2011-03-29 08:52:56 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2011-03-29 08:52:56 -0700
commit97d81766fd33cea0dc9bac9bcc71980f8c4c8726 (patch)
tree0b29a8a86e67df66b8a4f1dccb46633cc93eb4df
parent471bfa78ffca4249ec38ac16c0cdbb789be45a72 (diff)
parent4fecade5f21d5d062ebe1c70535367d3407bb68f (diff)
downloadsystem_core-97d81766fd33cea0dc9bac9bcc71980f8c4c8726.tar.gz
system_core-97d81766fd33cea0dc9bac9bcc71980f8c4c8726.tar.bz2
system_core-97d81766fd33cea0dc9bac9bcc71980f8c4c8726.zip
am 4fecade5: am cb1e616e: am 7c556549: Merge changes Icdefb5ff,Icd7f5f03
* commit '4fecade5f21d5d062ebe1c70535367d3407bb68f': Fix potential race introduced in Icd7f5f03 SocketClient: add optional reference counting
0 files changed, 0 insertions, 0 deletions