commit 32e09b5891da0174f161d99e2d3ebe67d6efa39c
author Alex Sakhartchouk <alexst@google.com> Mon Aug 23 10:24:10 2010 -0700
committer Alex Sakhartchouk <alexst@google.com> Mon Aug 23 10:24:10 2010 -0700
tree 244b492ddfc2049b8d2c3a2330a4acef337a276e
parent 526e7a3c8549f504850d7e9148f70682ad0c537e

Renderscript samples.
Resolving name conflict in model viewer.
Adding fov projection matrix function.
Adding helper methods for blending.

Change-Id: Ibd3f1510436811398787c285845d050158bd6de8

libs/rs/java/ModelViewer/AndroidManifest.xml

diff --git a/libs/rs/java/ModelViewer/AndroidManifest.xml b/libs/rs/java/ModelViewer/AndroidManifest.xml
index 39976d2..959fe53 100644
--- a/libs/rs/java/ModelViewer/AndroidManifest.xml
+++ b/libs/rs/java/ModelViewer/AndroidManifest.xml
@@ -2,7 +2,8 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.android.modelviewer">
     <application android:label="ModelViewer">
-        <activity android:name="ModelViewer"
+        <activity android:name="SimpleModel"
+                  android:label="SimpleModel"
                   android:screenOrientation="portrait"
                   android:theme="@android:style/Theme.Black.NoTitleBar">
             <intent-filter>