[automerger skipped] Merge "Don't throw in socket_read if socket_read_all returns < 0" into tm-dev am: d2a905d587 -s ours
am skip reason: Merged-In I2a04a799d3748c221f8555fa7afc40d73f0f392c with SHA-1 e6cf914c3f is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18349184
Change-Id: I36ec686c0bf9ded038882b5001bc70fa4029ffb3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: