diff options
| author | Hung-ying Tyan <tyanh@google.com> | 2009-09-16 01:27:34 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2009-09-16 01:27:34 -0700 |
| commit | e74b1c6ae4c21d81ad7343e8ac53c259b2b869cf (patch) | |
| tree | 6551c2fefe8d8d174fd7784cf15d53b9255de402 /AndroidManifest.xml | |
| parent | 7b22c686854263194e37250117c62457f9ba6e89 (diff) | |
| parent | 10d3cf5082edb42f196ce0d5ac77c7a12b959599 (diff) | |
| download | packages_apps_settings-e74b1c6ae4c21d81ad7343e8ac53c259b2b869cf.zip packages_apps_settings-e74b1c6ae4c21d81ad7343e8ac53c259b2b869cf.tar.gz packages_apps_settings-e74b1c6ae4c21d81ad7343e8ac53c259b2b869cf.tar.bz2 | |
am 10d3cf50: Enable cert install from sdcard in Settings...
Merge commit '10d3cf5082edb42f196ce0d5ac77c7a12b959599' into eclair-plus-aosp
* commit '10d3cf5082edb42f196ce0d5ac77c7a12b959599':
Enable cert install from sdcard in Settings...
Diffstat (limited to 'AndroidManifest.xml')
| -rw-r--r-- | AndroidManifest.xml | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/AndroidManifest.xml b/AndroidManifest.xml index db39e3c..550e4be 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -300,7 +300,6 @@ <action android:name="android.intent.action.MAIN" /> <action android:name="android.settings.SECURITY_SETTINGS" /> <action android:name="android.settings.LOCATION_SOURCE_SETTINGS" /> - <action android:name="android.security.ADD_CREDENTIAL" /> <action android:name="android.security.UNLOCK_CREDENTIAL_STORAGE" /> <category android:name="android.intent.category.DEFAULT" /> <category android:name="android.intent.category.VOICE_LAUNCH" /> |