Merge commit '99d5938c'

Resolve conflict per ag/326799

Conflicts:
	AndroidManifest.xml

diff --cc AndroidManifest.xml
index 96eea48,b489a89..c8a8b74
--- 1/AndroidManifest.xml
--- 2/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@@ -810,11 -809,11 +811,11 @@@
              </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"
                  android:configChanges="orientation|keyboardHidden|screenSize"