tree 0b29a8a86e67df66b8a4f1dccb46633cc93eb4df
parent a6d6a6d8beab1bdeac645784cb61ea76021681e7
parent 34859033c1076f23d958349b86cb0a5d42696745
author Brad Fitzpatrick <bradfitz@android.com> 1301413971 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1301413971 -0700

am 34859033: am fdb915d2: (-s ours) am 4593e0a7: Merge "libsysutils: Fix race condition in SocketListener thread."

* commit '34859033c1076f23d958349b86cb0a5d42696745':
  libsysutils: Fix race condition in SocketListener thread.