am 9467926b: am cc8d56f6: Merge "Unhide DISALLOW_OUTGOING_BEAM" into lmp-mr1-dev

* commit '9467926bd14a2d7f92fcdfdc7207f84d951f6e1f': Unhide DISALLOW_OUTGOING_BEAM
2014-11-10 16:58:53 +00:00
parent 93cdf1041e 9467926bd1
commit 9e19c118a1
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";