diff options
| author | Nicolas Prevot <nprevot@google.com> | 2014-07-24 19:59:48 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-07-24 19:59:48 +0000 |
| commit | b593e79436593b5b73416c65743c86118d03a6bc (patch) | |
| tree | c23e6b4e6d92e8f3e4781d3fa26306596b2d69ba /api | |
| parent | 811dce520d7e1ef4076156472c316152d7f4cde7 (diff) | |
| parent | f2e791fcdd9b86738c1599b4da3f2301bffddff2 (diff) | |
| download | frameworks_base-b593e79436593b5b73416c65743c86118d03a6bc.zip frameworks_base-b593e79436593b5b73416c65743c86118d03a6bc.tar.gz frameworks_base-b593e79436593b5b73416c65743c86118d03a6bc.tar.bz2 | |
am 498694c6: am 1b4a211d: am 4fe8fe2b: Merge "Making the clipboard work across users." into lmp-dev
* commit '498694c67112923f85f3572c4b7ad093283d1f68':
Making the clipboard work across users.
Diffstat (limited to 'api')
| -rw-r--r-- | api/current.txt | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/api/current.txt b/api/current.txt index 61b0cb2..c2ba4a3 100644 --- a/api/current.txt +++ b/api/current.txt @@ -22733,6 +22733,7 @@ package android.os { field public static final java.lang.String DISALLOW_CONFIG_VPN = "no_config_vpn"; field public static final java.lang.String DISALLOW_CONFIG_WIFI = "no_config_wifi"; field public static final java.lang.String DISALLOW_CREATE_WINDOWS = "no_create_windows"; + field public static final java.lang.String DISALLOW_CROSS_PROFILE_COPY_PASTE = "no_cross_profile_copy_paste"; field public static final java.lang.String DISALLOW_DEBUGGING_FEATURES = "no_debugging_features"; field public static final java.lang.String DISALLOW_FACTORY_RESET = "no_factory_reset"; field public static final java.lang.String DISALLOW_INSTALL_APPS = "no_install_apps"; |