am 4838c59f: Merge "Excluding ChooseLockGeneric from recents"

* commit '4838c59f88e1c110d5f51ff4de514d42ebbb2cc6':
  Excluding ChooseLockGeneric from recents
This commit is contained in:
Steven Ross
2011-10-04 03:29:06 -07:00
committed by Android Git Automerger

View File

@@ -731,7 +731,8 @@
android:windowSoftInputMode="stateVisible|adjustResize"/>
<activity android:name="ChooseLockGeneric"
android:label="@string/lockpassword_choose_lock_generic_header">
android:label="@string/lockpassword_choose_lock_generic_header"
android:excludeFromRecents="true" >
<intent-filter>
<action android:name="android.app.action.SET_NEW_PASSWORD" />
<category android:name="android.intent.category.DEFAULT" />