diff options
| author | Android (Google) Code Review <android-gerrit@google.com> | 2009-10-29 15:48:51 -0400 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2009-10-29 15:48:51 -0400 |
| commit | ec1f1e3df1ca5e73e262df479bf91a92f3ccafde (patch) | |
| tree | 815bbc2219200362f3d5ab4894658d5b2d66cd4d | |
| parent | b5c05516ba2c341655d54f17bdd17a5ab2d173df (diff) | |
| parent | eab4c75b09aa81ea093c2b9fbb3dbc2016c9bd6e (diff) | |
| download | frameworks_base-ec1f1e3df1ca5e73e262df479bf91a92f3ccafde.zip frameworks_base-ec1f1e3df1ca5e73e262df479bf91a92f3ccafde.tar.gz frameworks_base-ec1f1e3df1ca5e73e262df479bf91a92f3ccafde.tar.bz2 | |
Merge change Ieab4c75b into eclair
* changes:
Fix type in Java enums. Not currently used, easier to fix now than when apps are using it.
| -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) { |