summaryrefslogtreecommitdiffstats
path: root/services/surfaceflinger/SurfaceFlinger.cpp
diff options
context:
space:
mode:
authorJamie Gennis <jgennis@google.com>2012-08-24 11:11:06 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2012-08-24 11:11:07 -0700
commit490aee0fc5012acf2bf0b1dfe9c09e6fcca606fc (patch)
tree97fed915e84c3697091a9897fdb459f814071cfd /services/surfaceflinger/SurfaceFlinger.cpp
parent9b6a395e65ff88ab79fe92d6f112c434441ca606 (diff)
parent9fea3421ffddf6480f57f55a25936a886043d909 (diff)
downloadframeworks_native-490aee0fc5012acf2bf0b1dfe9c09e6fcca606fc.zip
frameworks_native-490aee0fc5012acf2bf0b1dfe9c09e6fcca606fc.tar.gz
frameworks_native-490aee0fc5012acf2bf0b1dfe9c09e6fcca606fc.tar.bz2
Merge "SurfaceTexture: inherit from ConsumerBase (try 2)" into jb-mr1-dev
Diffstat (limited to 'services/surfaceflinger/SurfaceFlinger.cpp')
0 files changed, 0 insertions, 0 deletions