Merge "Fix wrong format in AndroidManifest.xml" am: de795d12d1

am: 39ddac51b6

Change-Id: Ife3991761d4fcbf5cecdb6745536f9ed99069a2e
This commit is contained in:
songkailun
2017-09-29 14:46:23 +00:00
committed by android-build-merger

View File

@@ -2363,11 +2363,11 @@
android:label="@string/crypt_keeper_encrypt_title"> android:label="@string/crypt_keeper_encrypt_title">
<intent-filter android:priority="1"> <intent-filter android:priority="1">
<action android:name="android.app.action.START_ENCRYPTION" /> <action android:name="android.app.action.START_ENCRYPTION" />
<category android:name="android.intent.category.DEFAULT" /> /> <category android:name="android.intent.category.DEFAULT" />
</intent-filter> </intent-filter>
<intent-filter> <intent-filter>
<action android:name="android.intent.action.MAIN" /> <action android:name="android.intent.action.MAIN" />
<category android:name="android.intent.category.DEFAULT" /> /> <category android:name="android.intent.category.DEFAULT" />
</intent-filter> </intent-filter>
<meta-data android:name="com.android.settings.FRAGMENT_CLASS" <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
android:value="com.android.settings.CryptKeeperSettings" /> android:value="com.android.settings.CryptKeeperSettings" />