am 136059f1: Merge "Revert "Completely remove app ops activity."" into jb-mr2-dev

                android:value="com.android.settings.NotificationStation" />

        </activity>

        <!--

        <activity android:name="Settings$AppOpsSummaryActivity"

                android:label="@string/app_ops_settings"

                android:taskAffinity=""

                <action android:name="android.intent.action.MAIN" />

                <action android:name="android.settings.APP_OPS_SETTINGS" />

                <category android:name="android.intent.category.DEFAULT" />

                <!-- Not yet ready to expose.

                <category android:name="android.intent.category.VOICE_LAUNCH" />

                <category android:name="com.android.settings.SHORTCUT" />

                -->

            </intent-filter>

            <meta-data android:name="com.android.settings.FRAGMENT_CLASS"

                android:value="com.android.settings.applications.AppOpsSummary" />

            <!--

            <meta-data android:name="com.android.settings.TOP_LEVEL_HEADER_ID"

                android:resource="@id/application_settings" />

                android:resource="@id/application_settings" /> -->

        </activity>

        -->

        <activity android:name="Settings$LocationSettingsActivity"

                android:label="@string/location_settings_title"