diff options
| author | Bill Yi <byi@google.com> | 2016-08-24 11:23:13 -0700 |
|---|---|---|
| committer | Bill Yi <byi@google.com> | 2016-08-24 11:23:13 -0700 |
| commit | e71ecb2c4df15f727f51a0e1b65459f071853e35 (patch) | |
| tree | 0b87e8d0c0e2fe4dcd1d186fe1546b3b4489b002 /rs/java/android/renderscript/Script.java | |
| parent | 5d4732555dd0f1611de037dee59e0006da23be46 (diff) | |
| parent | 29835cc56eb26089cd8d2c21c7507c9d0588ceb0 (diff) | |
Merge remote-tracking branch 'goog/stage-aosp-master' into HEAD
Change-Id: I1c7301e4e6d7e5fed1fd57d2fb9cb65baf819de0
Diffstat (limited to 'rs/java/android/renderscript/Script.java')
| -rw-r--r-- | rs/java/android/renderscript/Script.java | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/rs/java/android/renderscript/Script.java b/rs/java/android/renderscript/Script.java index 35c9a13dc62f..13d5fcd57446 100644 --- a/rs/java/android/renderscript/Script.java +++ b/rs/java/android/renderscript/Script.java @@ -288,7 +288,6 @@ public class Script extends BaseObj { /** * Only intended for use by generated reflected code. (General reduction) * - * @hide */ protected void reduce(int slot, Allocation[] ains, Allocation aout, LaunchOptions sc) { mRS.validate(); |