tree 50f907d4d31691b82afe808d24594b8294e227b8
parent 2dd56526a6a8447c694bb5540e01cc350664926b
parent b27c379b259d42a1e90eb4b4d79abc2426def731
author Neil Fuller <nfuller@google.com> 1436441916 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1436441916 +0000

am b27c379b: am 2ca4f73e: Merge "Switch LocalSocketImpl.accept() over to using Os.accept()"

* commit 'b27c379b259d42a1e90eb4b4d79abc2426def731':
  Switch LocalSocketImpl.accept() over to using Os.accept()