| commit | 0fe09fd76946668edd4b0a41d891b7bec566de86 | [log] [tgz] |
|---|---|---|
| author | Neil Fuller <nfuller@google.com> | Sat Jul 04 02:58:33 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Sat Jul 04 02:58:33 2015 +0000 |
| tree | 143b336518cbdba3c2c0c78f3d1cb76a2897c192 | |
| parent | 2826264066c755f72c2a4395aa03fd017548db2d [diff] | |
| parent | c16f65807b0251fdb0149d0bb1eacba370b585b1 [diff] |
am 6e15462e: am 82a3e51d: Merge "Modify test now that LocalSocket.getSoTimeout() does something" * commit '6e15462e4b85f7d4b6773ae88d95cfe4a1b8ac2f': Modify test now that LocalSocket.getSoTimeout() does something