Merge change I4bd71b0f into eclair

* changes:
  Fix http://b/issue?id=2203681
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index fce4230..bd9a4de 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -83,7 +83,8 @@
         <activity
             android:name="WallpaperChooser"
             android:label="@string/pick_wallpaper"
-            android:icon="@drawable/ic_launcher_wallpaper">
+            android:icon="@drawable/ic_launcher_wallpaper"
+            android:screenOrientation="nosensor">
             <intent-filter>
                 <action android:name="android.intent.action.SET_WALLPAPER" />
                 <category android:name="android.intent.category.DEFAULT" />