diff options
| author | Andres Morales <anmorales@google.com> | 2014-11-10 16:48:42 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-11-10 16:48:45 +0000 |
| commit | cc8d56f66c64a66002b90ed014bbd2fb46125f63 (patch) | |
| tree | 1f199ef66135119f73a55f6b64975725f2d0ba00 /core/java/android/os/UserManager.java | |
| parent | 705c9c131a6df977a2e9430cacb84788ef0cecbf (diff) | |
| parent | cd3b72e6f9a158ac492a4a8b5629d73b495a7d1e (diff) | |
| download | frameworks_base-cc8d56f66c64a66002b90ed014bbd2fb46125f63.zip frameworks_base-cc8d56f66c64a66002b90ed014bbd2fb46125f63.tar.gz frameworks_base-cc8d56f66c64a66002b90ed014bbd2fb46125f63.tar.bz2 | |
Merge "Unhide DISALLOW_OUTGOING_BEAM" into lmp-mr1-dev
Diffstat (limited to 'core/java/android/os/UserManager.java')
| -rw-r--r-- | core/java/android/os/UserManager.java | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/core/java/android/os/UserManager.java b/core/java/android/os/UserManager.java index 8ffd8f4..bd6eeea 100644 --- 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"; |