Merge "Unhide DISALLOW_OUTGOING_BEAM" into lmp-mr1-dev

2014-11-10 16:48:42 +00:00
parent 705c9c131a cd3b72e6f9
commit cc8d56f66c
1 changed files with 0 additions and 1 deletions
--- a/core/java/android/os/UserManager.java
+++ b/core/java/android/os/UserManager.java
@@ -367,7 +367,6 @@ public class UserManager {
     * <p/>Type: Boolean
     * @see #setUserRestrictions(Bundle)
     * @see #getUserRestrictions()
-     * @hide
     */
    public static final String DISALLOW_OUTGOING_BEAM = "no_outgoing_beam";