summaryrefslogtreecommitdiff
path: root/graphics/java/android/renderscript/ProgramFragmentFixedFunction.java
diff options
context:
space:
mode:
authorTim Murray <timmurray@google.com>2013-03-27 21:32:31 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2013-03-27 21:32:31 +0000
commit8ff0201ad0354b6c43aebac6075298ee847c42ef (patch)
tree364cd6fecc6be3ea5192ce9cdfaa1f2fe9b4cc97 /graphics/java/android/renderscript/ProgramFragmentFixedFunction.java
parent8565520b85bd42bc57adc551c4a72bc3f5b0025a (diff)
parent275812c2bb09a82efd7ea8d90b57c99ff51eab0a (diff)
Merge "Revert "Remove all public mention of RS graphics from docs."" into jb-mr2-dev
Diffstat (limited to 'graphics/java/android/renderscript/ProgramFragmentFixedFunction.java')
-rw-r--r--graphics/java/android/renderscript/ProgramFragmentFixedFunction.java1
1 files changed, 0 insertions, 1 deletions
diff --git a/graphics/java/android/renderscript/ProgramFragmentFixedFunction.java b/graphics/java/android/renderscript/ProgramFragmentFixedFunction.java
index 8ae177733dc0..848c5a37cbc9 100644
--- a/graphics/java/android/renderscript/ProgramFragmentFixedFunction.java
+++ b/graphics/java/android/renderscript/ProgramFragmentFixedFunction.java
@@ -21,7 +21,6 @@ import android.util.Log;
/**
- * @hide
* @deprecated in API 16
* <p>ProgramFragmentFixedFunction is a helper class that provides
* a way to make a simple fragment shader without writing any