tree c2c9d46504b733da17edf19e40282b88e9a48ff5
parent 8d092defa4c083e1b6c7a496080a56603418296e
parent c7027a459aa64413953b4707f5e4e5cb4a757c7a
author Elliott Hughes <enh@google.com> 1573494025 -0800
committer android-build-merger <android-build-merger@google.com> 1573494025 -0800

Merge "libcutils: remove unused socket_set_receive_timeout()." am: a8f3081663
am: c7027a459a

Change-Id: I9b7eff359db67a4e65dbeb3c213f7f7a2ac216a8