summaryrefslogtreecommitdiffstats
path: root/rs
diff options
context:
space:
mode:
authorMiao Wang <miaowang@google.com>2015-05-11 21:13:46 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2015-05-11 21:13:47 +0000
commitcb556e0d25d4be11f5441c9b23c96633cfd4ca95 (patch)
treed01732b276c7dfbe4c5ce00c0dcba714654e8e09 /rs
parent51506326d1629ed6e1423c11ff2238c6f19b742f (diff)
parent3c61327fa990c2ea79527fd18fb9e448d39e1622 (diff)
downloadframeworks_base-cb556e0d25d4be11f5441c9b23c96633cfd4ca95.zip
frameworks_base-cb556e0d25d4be11f5441c9b23c96633cfd4ca95.tar.gz
frameworks_base-cb556e0d25d4be11f5441c9b23c96633cfd4ca95.tar.bz2
Merge "[RenderScript] hide Allocation.copyToFieldPacker()" into mnc-dev
Diffstat (limited to 'rs')
-rw-r--r--rs/java/android/renderscript/Allocation.java2
1 files changed, 2 insertions, 0 deletions
diff --git a/rs/java/android/renderscript/Allocation.java b/rs/java/android/renderscript/Allocation.java
index 3b61f9d..70a5821 100644
--- a/rs/java/android/renderscript/Allocation.java
+++ b/rs/java/android/renderscript/Allocation.java
@@ -1422,6 +1422,8 @@ public class Allocation extends BaseObj {
}
/**
+ * @hide
+ *
* This is only intended to be used by auto-generated code reflected from
* the RenderScript script files and should not be used by developers.
*