diff options
| author | Baligh Uddin <baligh@google.com> | 2013-08-01 15:04:30 -0700 |
|---|---|---|
| committer | Baligh Uddin <baligh@google.com> | 2013-08-01 15:04:30 -0700 |
| commit | 15885f499850b1b0a4e3f18e685d6ac1f0e5200b (patch) | |
| tree | f1732e5f788803d1046707d29331729d5c081a60 | |
| parent | 34605e1dcf4ac61109911836e7bba864f62080d6 (diff) | |
| parent | 99d5938cf26d818deb9b30917ffafcb4b6b46365 (diff) | |
| download | packages_apps_Settings-15885f499850b1b0a4e3f18e685d6ac1f0e5200b.zip packages_apps_Settings-15885f499850b1b0a4e3f18e685d6ac1f0e5200b.tar.gz packages_apps_Settings-15885f499850b1b0a4e3f18e685d6ac1f0e5200b.tar.bz2 | |
Merge commit '99d5938c'
Resolve conflict per ag/326799
Conflicts:
AndroidManifest.xml
| -rw-r--r-- | AndroidManifest.xml | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 96eea48..c8a8b74 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -797,6 +797,7 @@ android:value="com.android.settings.NotificationStation" /> </activity> + <!-- <activity android:name="Settings$AppOpsSummaryActivity" android:label="@string/app_ops_settings" android:taskAffinity="" @@ -810,10 +811,10 @@ </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" |