commit adcb8a46ae7bd4a02376582fcb477c54e1d143fe
author Nick Kralevich <nnk@google.com> Fri Dec 14 16:49:10 2018 -0800
committer android-build-merger <android-build-merger@google.com> Fri Dec 14 16:49:10 2018 -0800
tree 785bed4ac95fb2ef28641b4e86c673a8293ea65f
parent 52fdd0d5081c397c5451ef31052b551007ff61c2
parent 8eae4981ffbae7018f8af5758b71156d4d1cceb4

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

Change-Id: I083eeb909d24ecd33451bb5cd23c03d6f724f052

api/current.txt

diff --git a/api/current.txt b/api/current.txt
index ee1b6d2..d65cb47 100755
--- a/api/current.txt
+++ b/api/current.txt
@@ -40853,7 +40853,9 @@
     field public static final int SIOCGIFBRDADDR;
     field public static final int SIOCGIFDSTADDR;
     field public static final int SIOCGIFNETMASK;
+    field public static final int SOCK_CLOEXEC;
     field public static final int SOCK_DGRAM;
+    field public static final int SOCK_NONBLOCK;
     field public static final int SOCK_RAW;
     field public static final int SOCK_SEQPACKET;
     field public static final int SOCK_STREAM;