summaryrefslogtreecommitdiffstats
path: root/libs/rs/rsComponent.cpp
diff options
context:
space:
mode:
authorMathias Agopian <mathias@google.com>2011-11-30 10:50:52 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>2011-11-30 10:50:52 -0800
commit993b2099cee5c3ad86a5fbbd29194994336187be (patch)
tree418b272f4f123457611c33146a53cf5ad3abb0fb /libs/rs/rsComponent.cpp
parentdf96385b9acf9ec74c62edc34ffa9c8d9dae1c03 (diff)
parent55d3880eed3450748eb7b97281e030902ee29c2a (diff)
downloadframeworks_base-993b2099cee5c3ad86a5fbbd29194994336187be.zip
frameworks_base-993b2099cee5c3ad86a5fbbd29194994336187be.tar.gz
frameworks_base-993b2099cee5c3ad86a5fbbd29194994336187be.tar.bz2
am 55d3880e: am bb1e7d43: Merge changes I7e973a35,Ib3386fcc into ics-mr1
* commit '55d3880eed3450748eb7b97281e030902ee29c2a': SurfaceTexture: add EGL_KHR_fence_sync option SurfaceTexture: add a blit-to-FBO test
Diffstat (limited to 'libs/rs/rsComponent.cpp')
0 files changed, 0 insertions, 0 deletions