Merge "Make AndroidManifest.xml's activity match what's in Java files"
diff --git a/samples/RenderScript/Balls/AndroidManifest.xml b/samples/RenderScript/Balls/AndroidManifest.xml
index 00519d4..c0ae2ff 100644
--- a/samples/RenderScript/Balls/AndroidManifest.xml
+++ b/samples/RenderScript/Balls/AndroidManifest.xml
@@ -5,7 +5,7 @@
     <application 
         android:label="RsBalls"
         android:icon="@drawable/test_pattern">
-        <activity android:name="RsBalls"
+        <activity android:name="Balls"
                   android:screenOrientation="landscape">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
diff --git a/samples/RenderScript/Fountain/AndroidManifest.xml b/samples/RenderScript/Fountain/AndroidManifest.xml
index 9fd7c09..3d72552 100644
--- a/samples/RenderScript/Fountain/AndroidManifest.xml
+++ b/samples/RenderScript/Fountain/AndroidManifest.xml
@@ -2,10 +2,10 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.example.android.rs.fountain">
     <uses-sdk android:minSdkVersion="11" />
-    <application 
+    <application
         android:label="RsFountain"
         android:icon="@drawable/test_pattern">
-        <activity android:name="RsFountain">
+        <activity android:name="Fountain">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.LAUNCHER" />
diff --git a/samples/RenderScript/HelloCompute/AndroidManifest.xml b/samples/RenderScript/HelloCompute/AndroidManifest.xml
index 2121680..a7baf0d 100644
--- a/samples/RenderScript/HelloCompute/AndroidManifest.xml
+++ b/samples/RenderScript/HelloCompute/AndroidManifest.xml
@@ -20,7 +20,7 @@
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />    
     <uses-sdk android:minSdkVersion="11" />
     <application android:label="RsHelloCompute">
-        <activity android:name="RsHelloCompute">
+        <activity android:name="HelloCompute">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.LAUNCHER" />
diff --git a/samples/RenderScript/HelloWorld/AndroidManifest.xml b/samples/RenderScript/HelloWorld/AndroidManifest.xml
index 9352077..1d37dc9 100644
--- a/samples/RenderScript/HelloWorld/AndroidManifest.xml
+++ b/samples/RenderScript/HelloWorld/AndroidManifest.xml
@@ -19,7 +19,7 @@
     <uses-sdk android:minSdkVersion="11" />
     <application android:label="RsHelloWorld"
     android:icon="@drawable/test_pattern">
-        <activity android:name="RsHelloWorld"
+        <activity android:name="HelloWorld"
                   android:label="RsHelloWorld"
                   android:theme="@android:style/Theme.Black.NoTitleBar">
             <intent-filter>