am 63c6a309: Merge "Add dock icon for top-level settings. #2367275" into eclair

Merge commit '63c6a30908a14cdc8cccee3f6a3e88275dcec30e' into eclair-plus-aosp

* commit '63c6a30908a14cdc8cccee3f6a3e88275dcec30e':
  Add dock icon for top-level settings. #2367275
This commit is contained in:
Amith Yamasani
2010-01-20 07:45:26 -08:00
committed by Android Git Automerger
3 changed files with 1 additions and 0 deletions

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 803 B

View File

@@ -137,6 +137,7 @@
<com.android.settings.IconPreferenceScreen
android:key="dock_settings"
settings:icon="@drawable/ic_settings_dock"
android:title="@string/dock_settings">
<intent
android:action="android.intent.action.MAIN"