OSDN Git Service

Merge "Fix receive timeout on LocalSocket"
authorNeil Fuller <nfuller@google.com>
Wed, 31 Aug 2016 16:35:24 +0000 (16:35 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 31 Aug 2016 16:35:24 +0000 (16:35 +0000)
commit680ec020a1fa4581d07c2d28ce90d7f052f23bda
tree125e8b2614f3a86f1d941777b5aa69d77507e5db
parente639bbd7d0be40e7ee6d71885050c3fa51a5bf65
parent7a9c0cd854405cd99fd359a70a63f1ba1ac2f223
Merge "Fix receive timeout on LocalSocket"
am: 7a9c0cd854

Change-Id: I4148f467921ad6a627fe8ebc5225e2de6717270f