tree e3143d2de086f0fa8c663bbeeb29f39ebcd3ac11
parent 4e638de3f1e9a442b7f4427c47da2a4932100c4d
parent 83bddfd9ecb92c77df695a2b033a5c473bb67d4f
author Neil Fuller <nfuller@google.com> 1472661720 +0000
committer android-build-merger <android-build-merger@google.com> 1472661720 +0000

Merge "Add CTS tests for LocalSocket read/write timeouts" am: 83bddfd9ec
am: 50ac25a1a7

Change-Id: Ic2199b23d256d9b56963b0ac91cc758fa07c0846