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.
This commit is contained in:
Jason Sams
2009-10-29 19:57:33 -07:00
committed by Android Git Automerger

View File

@@ -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) {