diff options
| author | Craig Lafayette <craiglafa@google.com> | 2015-06-29 12:48:19 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-06-29 12:48:21 +0000 |
| commit | bee7245c69cd3d3c1404f35299c3867d1b8525f5 (patch) | |
| tree | cadf33a8e71299c4d0f1dc605e71f2346f2fc4a3 /api/system-current.txt | |
| parent | 01056b36622eafa657c95f9576ec2b4cacb741a4 (diff) | |
| parent | 3cc72bab488b7395347a3f30b40632d78d819b43 (diff) | |
| download | frameworks_base-bee7245c69cd3d3c1404f35299c3867d1b8525f5.zip frameworks_base-bee7245c69cd3d3c1404f35299c3867d1b8525f5.tar.gz frameworks_base-bee7245c69cd3d3c1404f35299c3867d1b8525f5.tar.bz2 | |
Merge "Hide MIME_TYPE_PROVISIONING_NFC_V2" into mnc-dev
Diffstat (limited to 'api/system-current.txt')
| -rw-r--r-- | api/system-current.txt | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/api/system-current.txt b/api/system-current.txt index b83e7f2..9784dcb 100644 --- a/api/system-current.txt +++ b/api/system-current.txt @@ -5896,7 +5896,6 @@ package android.app.admin { field public static final int KEYGUARD_DISABLE_UNREDACTED_NOTIFICATIONS = 8; // 0x8 field public static final int KEYGUARD_DISABLE_WIDGETS_ALL = 1; // 0x1 field public static final java.lang.String MIME_TYPE_PROVISIONING_NFC = "application/com.android.managedprovisioning"; - field public static final java.lang.String MIME_TYPE_PROVISIONING_NFC_V2 = "application/com.android.managedprovisioning.v2"; field public static final int PASSWORD_QUALITY_ALPHABETIC = 262144; // 0x40000 field public static final int PASSWORD_QUALITY_ALPHANUMERIC = 327680; // 0x50000 field public static final int PASSWORD_QUALITY_BIOMETRIC_WEAK = 32768; // 0x8000 |