| commit | 36c3e9e1a55354e2de7ffbba7b93b9996ccd8c76 | [log] [tgz] |
|---|---|---|
| author | Miao Wang <miaowang@google.com> | Fri Apr 17 05:07:38 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Apr 17 05:07:38 2015 +0000 |
| tree | 63a1dbd47eec1ac328bf331858537463f9fc9dfc | |
| parent | 91b90dc1939cee84068b5e81dda2b8bef93f0541 [diff] | |
| parent | 49ae55cd688ac7b9b0c80765532e0b9fe4f9f90b [diff] |
am 49ae55cd: am 5e3be8d4: Merge "[RenderScript] change the constructor back to protected." * commit '49ae55cd688ac7b9b0c80765532e0b9fe4f9f90b': [RenderScript] change the constructor back to protected.
diff --git a/v8/renderscript/java/src/android/support/v8/renderscript/ScriptIntrinsicHistogram.java b/v8/renderscript/java/src/android/support/v8/renderscript/ScriptIntrinsicHistogram.java index 9833ea1..3ed48f9 100644 --- a/v8/renderscript/java/src/android/support/v8/renderscript/ScriptIntrinsicHistogram.java +++ b/v8/renderscript/java/src/android/support/v8/renderscript/ScriptIntrinsicHistogram.java
@@ -28,7 +28,7 @@ // API level for the intrinsic private static final int INTRINSIC_API_LEVEL = 19; - private ScriptIntrinsicHistogram(long id, RenderScript rs) { + protected ScriptIntrinsicHistogram(long id, RenderScript rs) { super(id, rs); }