Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 15885f49 authored by Baligh Uddin's avatar Baligh Uddin
Browse files

Merge commit '99d5938c' 

Resolve conflict per ag/326799

Conflicts:
	AndroidManifest.xml
parents 34605e1d 99d5938c

AndroidManifest.xml

+3 −2
Original line number Original line Diff line number Diff line
@@ -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"