commit | 20a240f2e3ad92c2f99436a5f3636116dac334f3 | [log] [tgz] |
---|---|---|
author | Neil Fuller <nfuller@google.com> | Tue Sep 20 13:09:31 2016 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Tue Sep 20 13:09:31 2016 +0000 |
tree | e8586713a63d5c0fd97c3a00fe808592715a3605 | |
parent | 0d5ac8b7f3b626a478a11c18464942b84b689e90 [diff] | |
parent | aa4af0588a288e6c6341ae907a7b396fca428a6a [diff] |
Merge "Prevent SocketTest off-thread Exception from escaping" am: 6ad1e2b8fd am: 7006f185d3 am: aa4af0588a Change-Id: Id9cd4ca1043caca9f62b0e9e9ef714187071dbf3