tree 254faac537583043c2096a88c2f194ad81847f7f
parent cc3f9d1e01fd9ec5c31ca30bfedd0a1624abb132
parent 4781e999a945a5c44778b60166cde5a8b65c1c02
author Elliott Hughes <enh@google.com> 1408124560 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1408124560 +0000

am 4781e999: Merge "Avoid triggering StrictMode when closing a socket." into lmp-dev

* commit '4781e999a945a5c44778b60166cde5a8b65c1c02':
  Avoid triggering StrictMode when closing a socket.