tree 785bed4ac95fb2ef28641b4e86c673a8293ea65f
parent 52fdd0d5081c397c5451ef31052b551007ff61c2
parent 8eae4981ffbae7018f8af5758b71156d4d1cceb4
author Nick Kralevich <nnk@google.com> 1544834950 -0800
committer android-build-merger <android-build-merger@google.com> 1544834950 -0800

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

Change-Id: I083eeb909d24ecd33451bb5cd23c03d6f724f052