diff options
| author | Jason Sams <rjsams@android.com> | 2009-10-29 19:30:11 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2009-10-29 19:30:11 -0700 |
| commit | e4133ec1296f23142eabf7783db417ecc8f1bb05 (patch) | |
| tree | 17114711b9bb443c279314c64345a29e66f8af05 /graphics/java | |
| parent | cd79e5e173e00995f072104f7a89cf4015a90efd (diff) | |
| parent | ec1f1e3df1ca5e73e262df479bf91a92f3ccafde (diff) | |
| download | frameworks_base-e4133ec1296f23142eabf7783db417ecc8f1bb05.zip frameworks_base-e4133ec1296f23142eabf7783db417ecc8f1bb05.tar.gz frameworks_base-e4133ec1296f23142eabf7783db417ecc8f1bb05.tar.bz2 | |
am ec1f1e3d: Merge change Ieab4c75b into eclair
Merge commit 'ec1f1e3df1ca5e73e262df479bf91a92f3ccafde' into eclair-mr2
* commit 'ec1f1e3df1ca5e73e262df479bf91a92f3ccafde':
Fix type in Java enums. Not currently used, easier to fix now than when apps are using it.
Diffstat (limited to 'graphics/java')
| -rw-r--r-- | graphics/java/android/renderscript/ProgramStore.java | 4 |
1 files changed, 2 insertions, 2 deletions
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 @@ public class ProgramStore extends BaseObj { 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 @@ public class ProgramStore extends BaseObj { 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) { |