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)
commit0aa7d4bb3f9c5e76a9b6d7b0fa6fd1a7981c6b93
tree8966b76abb413fe7b02a977cac401818b7276c2c
parent016e850921e7be7212d27c39d461fa267eae5c57
parentef1fb4889a3436060a0f8e995f0e4112419e847d
Merge "Fix receive timeout on LocalSocket" am: 7a9c0cd854 am: 680ec020a1
am: ef1fb4889a

Change-Id: Ie4befe516f369d903a61f22aab15e40ac09193a3