PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge commit '99d5938c'

Browse Source 
Resolve conflict per ag/326799

Conflicts:
	AndroidManifest.xml
This commit is contained in:
Baligh Uddin
2013-08-01 15:04:30 -07:00
parent 34605e1dcf 99d5938cf2
commit 15885f4998
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
AndroidManifest.xml
View File

@@ -797,6 +797,7 @@
android:value="com.android.settings.NotificationStation" /> android:value="com.android.settings.NotificationStation" />
</activity> </activity>
<!--
<activity android:name="Settings$AppOpsSummaryActivity" <activity android:name="Settings$AppOpsSummaryActivity"
android:label="@string/app_ops_settings" android:label="@string/app_ops_settings"
android:taskAffinity="" android:taskAffinity=""
@@ -810,10 +811,10 @@
</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.applications.AppOpsSummary" /> android:value="com.android.settings.applications.AppOpsSummary" />
<!--
<meta-data android:name="com.android.settings.TOP_LEVEL_HEADER_ID" <meta-data android:name="com.android.settings.TOP_LEVEL_HEADER_ID"
android:resource="@id/application_settings" /> --> android:resource="@id/application_settings" />
</activity> </activity>
-->
<activity android:name="Settings$LocationSettingsActivity" <activity android:name="Settings$LocationSettingsActivity"
android:label="@string/location_settings_title" android:label="@string/location_settings_title"