diff options
| author | Jessica Hummel <jhummel@google.com> | 2014-09-12 10:02:46 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-09-12 10:02:47 +0000 |
| commit | d4aaab99bb13c7f34df480bb170f2afc71849f3f (patch) | |
| tree | 3ff31bc813867eae71db4c79cabe9d389590d046 /api | |
| parent | 3b9309a01c9aa0544f97b2ec6abe7b254d829336 (diff) | |
| parent | 5669216e0d0aa86b2b82448c944b12b0382e0f90 (diff) | |
| download | frameworks_base-d4aaab99bb13c7f34df480bb170f2afc71849f3f.zip frameworks_base-d4aaab99bb13c7f34df480bb170f2afc71849f3f.tar.gz frameworks_base-d4aaab99bb13c7f34df480bb170f2afc71849f3f.tar.bz2 | |
Merge "Use correct string for provisioning complete action." into lmp-dev
Diffstat (limited to 'api')
| -rw-r--r-- | api/current.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/api/current.txt b/api/current.txt index 96aac9b..dd0723c 100644 --- a/api/current.txt +++ b/api/current.txt @@ -5406,7 +5406,7 @@ package android.app.admin { field public static final java.lang.String ACTION_PASSWORD_EXPIRING = "android.app.action.ACTION_PASSWORD_EXPIRING"; field public static final java.lang.String ACTION_PASSWORD_FAILED = "android.app.action.ACTION_PASSWORD_FAILED"; field public static final java.lang.String ACTION_PASSWORD_SUCCEEDED = "android.app.action.ACTION_PASSWORD_SUCCEEDED"; - field public static final java.lang.String ACTION_PROFILE_PROVISIONING_COMPLETE = "android.app.action.ACTION_PROFILE_PROVISIONING_COMPLETE"; + field public static final java.lang.String ACTION_PROFILE_PROVISIONING_COMPLETE = "android.app.action.PROFILE_PROVISIONING_COMPLETE"; field public static final java.lang.String DEVICE_ADMIN_META_DATA = "android.app.device_admin"; field public static final java.lang.String EXTRA_DISABLE_WARNING = "android.app.extra.DISABLE_WARNING"; field public static final java.lang.String EXTRA_LOCK_TASK_PACKAGE = "android.app.extra.LOCK_TASK_PACKAGE"; |