summaryrefslogtreecommitdiff
path: root/libs/hwui/Program.cpp
diff options
context:
space:
mode:
author Miao Wang <miaowang@google.com> 2015-01-22 01:32:36 +0000
committer android-build-merger <android-build-merger@google.com> 2015-01-22 01:32:36 +0000
commit0cfd6b991a9344805602f9edb179748e86b38cf0 (patch)
treedf341a283f886efbaf72f81ce79da5d3e3512383 /libs/hwui/Program.cpp
parentf9c240ee655ddece0627adc2f94f7132a7784b67 (diff)
parent118245d939656903ab570fb80dd651b1158dadf1 (diff)
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
automerge: 118245d * commit '118245d939656903ab570fb80dd651b1158dadf1': [Renderscript] Add check for Allocation.copyTo(Array) and Fix the input allocation type check for Histogram Intrinsic.
Diffstat (limited to 'libs/hwui/Program.cpp')
0 files changed, 0 insertions, 0 deletions