| commit | bc7c83dae47167dd7cf89f2d4f4edd60223ed758 | [log] [tgz] |
|---|---|---|
| author | Miao Wang <miaowang@google.com> | Fri Apr 17 06:13:28 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Apr 17 06:13:28 2015 +0000 |
| tree | 620e8f2d9f501b45d5a8e21dd6605039a0e964f7 | |
| parent | 2eeeaccdf40bba25555e9c78162320306cf4f838 [diff] | |
| parent | 36c3e9e1a55354e2de7ffbba7b93b9996ccd8c76 [diff] |
am 36c3e9e1: am 49ae55cd: am 5e3be8d4: Merge "[RenderScript] change the constructor back to protected." * commit '36c3e9e1a55354e2de7ffbba7b93b9996ccd8c76': [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); }