commit b186e3c9195112f7acf938be388889dd773c2b18
author Erik Kline <ek@google.com> Tue Mar 10 22:04:27 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Tue Mar 10 22:04:27 2015 +0000
tree 117e14d5da80d8e3cd6f2afcba5b8eacee303eed
parent 2e1d4fcc089f4d3451e9c982e7b192143df37674
parent 24c68680f1c187fa9d2a9cc4c4ddb5ae09fa7dfb

am 24c68680: am 649f614e: am 2882e512: Merge "Add support for netlink sockets and addresses."

* commit '24c68680f1c187fa9d2a9cc4c4ddb5ae09fa7dfb':
  Add support for netlink sockets and addresses.

luni/src/main/java/android/system/OsConstants.java

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();