OSDN Git Service

Merge \"Delete simple reduction implementation.\" into nyc-dev
authorDavid Gross <dgross@google.com>
Mon, 13 Jun 2016 22:12:48 +0000 (22:12 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 13 Jun 2016 22:12:48 +0000 (22:12 +0000)
commit8e988ec8d8f509023e5fda40ac93dc7cf9f9cc4a
tree7e056040cbb05f53fef4aab568c3c5d48c6b6451
parent0aa4bb9e6bb67f22d74e7fabdd495b8d42a9bfd1
parentd749245b88456fcec8be1b93528e179d3a2d61aa
Merge \"Delete simple reduction implementation.\" into nyc-dev
am: d749245b88

Change-Id: I28a4e52a41678ecb10b0869566e1cb79d4287b60
rs/java/android/renderscript/RenderScript.java
rs/jni/android_renderscript_RenderScript.cpp