Merge "Fix receive timeout on LocalSocket" into nyc-mr1-dev

am: e3e952148c

Change-Id: I9da76c301bf8a480d48ff9c46ea9b57fb381daae
This commit is contained in:
Neil Fuller
2016-09-06 21:32:44 +00:00
committed by android-build-merger

Diff Content Not Available