tree ceda053cbff9f07ad4f19000dc4adac74e86fd9b
parent f6ab9afc46638fbe1122dee6c9c491198f0da961
parent a710b839a23633bb049a6f91ccd7e17261e406a4
author Miao Wang <miaowang@google.com> 1421889984 +0000
committer android-build-merger <android-build-merger@google.com> 1421889984 +0000

Merge "[Renderscript] Add check for Allocation.copyTo(Array) and Fix the input allocation type check for Histogram Intrinsic." into lmp-mr1-dev automerge: dbfcf3f
automerge: a710b83

* commit 'a710b839a23633bb049a6f91ccd7e17261e406a4':
  [Renderscript] Add check for Allocation.copyTo(Array) and Fix the input allocation type check for Histogram Intrinsic.