tree e6db81218814b2128dd2d556e5d8ff0e90b03a8d
parent d1012721c46ec4c6795ad7b4b23da2d5ac534f71
parent b9b0886335da4f621a00fe3af879820a54502100
author Erik Kline <ek@google.com> 1506683782 +0000
committer android-build-merger <android-build-merger@google.com> 1506683782 +0000

Merge "Change BlockingSocketReader to use MessageQueue fd handling" am: 48c7d27f64
am: b9b0886335

Change-Id: Id543589394c230b657ac150ab8fd4b9e388283eb