am 24c68680: am 649f614e: am 2882e512: Merge "Add support for netlink sockets and addresses."
* commit '24c68680f1c187fa9d2a9cc4c4ddb5ae09fa7dfb':
Add support for netlink sockets and addresses.
diff --git a/luni/src/main/java/android/system/OsConstants.java b/luni/src/main/java/android/system/OsConstants.java
index acc4435..a52004b 100644
--- a/luni/src/main/java/android/system/OsConstants.java
+++ b/luni/src/main/java/android/system/OsConstants.java
@@ -449,15 +449,15 @@
public static final int STDERR_FILENO = placeholder();
public static final int STDIN_FILENO = placeholder();
public static final int STDOUT_FILENO = placeholder();
- /** @hide */ public static final int ST_MANDLOCK = placeholder();
- /** @hide */ public static final int ST_NOATIME = placeholder();
- /** @hide */ public static final int ST_NODEV = placeholder();
- /** @hide */ public static final int ST_NODIRATIME = placeholder();
- /** @hide */ public static final int ST_NOEXEC = placeholder();
- /** @hide */ public static final int ST_NOSUID = placeholder();
- /** @hide */ public static final int ST_RDONLY = placeholder();
- /** @hide */ public static final int ST_RELATIME = placeholder();
- /** @hide */ public static final int ST_SYNCHRONOUS = placeholder();
+ public static final int ST_MANDLOCK = placeholder();
+ public static final int ST_NOATIME = placeholder();
+ public static final int ST_NODEV = placeholder();
+ public static final int ST_NODIRATIME = placeholder();
+ public static final int ST_NOEXEC = placeholder();
+ public static final int ST_NOSUID = placeholder();
+ public static final int ST_RDONLY = placeholder();
+ public static final int ST_RELATIME = placeholder();
+ public static final int ST_SYNCHRONOUS = placeholder();
public static final int S_IFBLK = placeholder();
public static final int S_IFCHR = placeholder();
public static final int S_IFDIR = placeholder();