commit 5e6bd56b7c4f237986324662bacb86c07dd9aad0
author Jason Sams <rjsams@android.com> Thu Oct 29 19:57:33 2009 -0700
committer Android Git Automerger <android-git-automerger@android.com> Thu Oct 29 19:57:33 2009 -0700
tree 40a3ac188306a9f631a4e22e1a03147931ec15a7
parent 095f3411a1a032847bffe2e21f57e1f27cc8a64e
parent e4133ec1296f23142eabf7783db417ecc8f1bb05

am e4133ec1: am ec1f1e3d: Merge change Ieab4c75b into eclair

Merge commit 'e4133ec1296f23142eabf7783db417ecc8f1bb05' into eclair-mr2-plus-aosp

* commit 'e4133ec1296f23142eabf7783db417ecc8f1bb05':
  Fix type in Java enums.  Not currently used, easier to fix now than when apps are using it.

graphics/java/android/renderscript/ProgramStore.java

diff --git a/graphics/java/android/renderscript/ProgramStore.java b/graphics/java/android/renderscript/ProgramStore.java
index b7d987e..5cbe1b2 100644
--- a/graphics/java/android/renderscript/ProgramStore.java
+++ b/graphics/java/android/renderscript/ProgramStore.java
@@ -49,7 +49,7 @@
         SRC_ALPHA (4),
         ONE_MINUS_SRC_ALPHA (5),
         DST_ALPHA (6),
-        ONE_MINUS_DST_ALPA (7),
+        ONE_MINUS_DST_ALPHA (7),
         SRC_ALPHA_SATURATE (8);
 
         int mID;
@@ -66,7 +66,7 @@
         SRC_ALPHA (4),
         ONE_MINUS_SRC_ALPHA (5),
         DST_ALPHA (6),
-        ONE_MINUS_DST_ALPA (7);
+        ONE_MINUS_DST_ALPHA (7);
 
         int mID;
         BlendDstFunc(int id) {