commit 2a28c71f445ae29d801f0519675512789f91fa51
author Lorenzo Colitti <lorenzo@google.com> Mon Mar 16 11:12:56 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Mon Mar 16 11:12:56 2015 +0000
tree 51aa7530fa813134b8515f373c303a8b5afea8f4
parent a4ca7f443a72043b25d1646cd6a77661e09eb63b
parent 1dacfbb464d8d21c312cca681a1a297e0f632f08

am 1dacfbb4: am 7d6411b7: Merge "Support packet sockets in libcore."

* commit '1dacfbb464d8d21c312cca681a1a297e0f632f08':
  Support packet sockets in libcore.

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 c0d31e5..f70c7e1 100644
--- a/luni/src/main/java/android/system/OsConstants.java
+++ b/luni/src/main/java/android/system/OsConstants.java
@@ -455,15 +455,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();