tree ad27a703494974805f1349da7593e3a79ae0342b
parent 52b7b5edc4b1b9a2d85bf67c3eff26d6b09aec7b
parent 1df013c3efd616062f298298b9d026d1d1a4fccb
author Jesse Hall <jessehall@google.com> 1494890378 +0000
committer android-build-merger <android-build-merger@google.com> 1494890378 +0000

Merge "Handle EINTR from sendmsg/recvmsg" into oc-dev
am: 1df013c3ef

Change-Id: I0f452c592ce7f87b05626f468a5c2ddb989ff242