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)
am: 680ec020a1

Change-Id: I9b5622a91cf459844ee3513191b45994d51c86a7


Trivial merge