tree a9d89705a71a1807a3e93db6be42e7f7c1cf7ed7
parent 6a1519f476e18a527113db09351d0f102ff01e4b
parent 252e7d2dddc3e613af245a48c3c5350be11ffaf1
author Miao Wang <miaowang@google.com> 1429201764 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1429201764 +0000

am 252e7d2d: Merge "[RenderScript] Update ScriptGroup2 and IntrinsicHistogram base on the native RS API."

* commit '252e7d2dddc3e613af245a48c3c5350be11ffaf1':
  [RenderScript] Update ScriptGroup2 and IntrinsicHistogram base on the native RS API.