OSDN Git Service

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

Change-Id: Ie4befe516f369d903a61f22aab15e40ac09193a3


Trivial merge