am d14cfc27: Merge change I9e384ddd into eclair

Merge commit 'd14cfc27627107c2973eeacc3bcbb2830a3fd620' into eclair-mr2

* commit 'd14cfc27627107c2973eeacc3bcbb2830a3fd620':
  Add a test pattern as rollo's icon

libs/rs/java/Rollo/AndroidManifest.xml

@@ -1,9 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.android.rollo">
-    <application android:label="Rollo">
+    <application
+        android:label="Rollo"
+        android:icon="@drawable/test_pattern">
         <activity android:name="Rollo"
-                  android:theme="@android:style/Theme.Translucent">
+                  android:theme="@android:style/Theme.Translucent"
+                  android:icon="@drawable/test_pattern">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.LAUNCHER" />