| commit | b27c379b259d42a1e90eb4b4d79abc2426def731 | [log] [tgz] |
|---|---|---|
| author | Neil Fuller <nfuller@google.com> | Thu Jul 09 11:23:00 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Jul 09 11:23:00 2015 +0000 |
| tree | d55d7cfd6b50837e85daacea4855c6a8dc90f440 | |
| parent | 30d75e60b3769a5bf7a948ebf5848813fcb8a838 [diff] | |
| parent | 2ca4f73e8036b35085f12cdbcff3350812c42ff6 [diff] |
am 2ca4f73e: Merge "Switch LocalSocketImpl.accept() over to using Os.accept()" * commit '2ca4f73e8036b35085f12cdbcff3350812c42ff6': Switch LocalSocketImpl.accept() over to using Os.accept()