tree c2e9ca96e12a414b109ecdab7423f76045aec6c1
parent 9a7f853b7cc5ba515f556ea0bbea685b7c8a8727
parent adcb8a46ae7bd4a02376582fcb477c54e1d143fe
author Nick Kralevich <nnk@google.com> 1544835517 -0800
committer android-build-merger <android-build-merger@google.com> 1544835517 -0800

Merge "api/current.txt: Add SOCK_CLOEXEC and SOCK_NONBLOCK" am: 1d709c965b am: 8eae4981ff
am: adcb8a46ae

Change-Id: I89bd7db8cc5b6723fa2a5cee9b785f7ad8f6c276