diff options
| author | Jason Sams <jsams@google.com> | 2012-09-04 16:59:06 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-09-04 16:59:07 -0700 |
| commit | f1ffb4f7fe2a8e9fd5df947a8071eccdeabaefd4 (patch) | |
| tree | 2f176a2dedc6c3e3ecda83d43332b92f7b1e35ef | |
| parent | d84aaa23a53b57834b0722ad36c460833dc4823c (diff) | |
| parent | c3f6d184bba5e2e0877d2c64a8624ffe07ea537d (diff) | |
| download | frameworks_base-f1ffb4f7fe2a8e9fd5df947a8071eccdeabaefd4.zip frameworks_base-f1ffb4f7fe2a8e9fd5df947a8071eccdeabaefd4.tar.gz frameworks_base-f1ffb4f7fe2a8e9fd5df947a8071eccdeabaefd4.tar.bz2 | |
Merge "update image processing to fix ScriptGroup names." into jb-mr1-dev
| -rw-r--r-- | tests/RenderScriptTests/ImageProcessing/src/com/android/rs/image/ImageProcessingActivity.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/RenderScriptTests/ImageProcessing/src/com/android/rs/image/ImageProcessingActivity.java b/tests/RenderScriptTests/ImageProcessing/src/com/android/rs/image/ImageProcessingActivity.java index 07626a3..327ff06 100644 --- a/tests/RenderScriptTests/ImageProcessing/src/com/android/rs/image/ImageProcessingActivity.java +++ b/tests/RenderScriptTests/ImageProcessing/src/com/android/rs/image/ImageProcessingActivity.java @@ -168,10 +168,10 @@ public class ImageProcessingActivity extends Activity mTest = new Vignette(true, true); break; case 15: - mTest = new GroupTest(true); + mTest = new GroupTest(false); break; case 16: - mTest = new GroupTest(false); + mTest = new GroupTest(true); break; case 17: mTest = new Intrinsics(0); |