merge from open-source master

This commit is contained in:
The Android Open Source Project
2010-02-05 13:51:37 -08:00

View File

@@ -23,6 +23,8 @@
<uses-feature android:name="android.software.live_wallpaper" /> <uses-feature android:name="android.software.live_wallpaper" />
<uses-feature android:name="android.software.live_wallpaper" />
<application <application
android:label="@string/wallpapers" android:label="@string/wallpapers"
android:icon="@drawable/ic_launcher_wallpaper"> android:icon="@drawable/ic_launcher_wallpaper">