OSDN Git Service

Merge "Fix receive timeout on LocalSocket" am: 7a9c0cd854
authorNeil Fuller <nfuller@google.com>
Wed, 31 Aug 2016 16:43:22 +0000 (16:43 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 31 Aug 2016 16:43:22 +0000 (16:43 +0000)
commitef1fb4889a3436060a0f8e995f0e4112419e847d
treea85826b217d111892711ee01d6f4d39f14169856
parent61c0996d6f562ffefdacdb6aaf1142a917d9b255
parent680ec020a1fa4581d07c2d28ce90d7f052f23bda
Merge "Fix receive timeout on LocalSocket" am: 7a9c0cd854
am: 680ec020a1

Change-Id: I9b5622a91cf459844ee3513191b45994d51c86a7