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

* commit 'cc8d56f66c64a66002b90ed014bbd2fb46125f63': Unhide DISALLOW_OUTGOING_BEAM
2014-11-10 16:53:18 +00:00
parent 642b4d93b9 cc8d56f66c
commit 9467926bd1
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";