tree a2e85595d082191043e291abe033aaccc1cf8031
parent 9f84418306831a042c42c5bf90dcfd7ccceba19a
parent 7e1af2dd407da07f907158c86014de33e5d313f2
author Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1579029698 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1579029698 +0000

Merge "Fix ioctl FIONREAD call parameters to use int instead of size_t" am: b17cdb26df am: 7e1af2dd40

Change-Id: I05410938bc94fb40a9a57f297eb52d487fc2daca