summaryrefslogtreecommitdiff
path: root/libs/gui/ConsumerBase.cpp
diff options
context:
space:
mode:
author Jamie Gennis <jgennis@google.com> 2012-10-22 13:54:50 -0700
committer Android Git Automerger <android-git-automerger@android.com> 2012-10-22 13:54:50 -0700
commit3b6055a7184a2da7bbdd94118a8c6af875bb28b1 (patch)
treebcf05782961e3783a251d588978d7baf87e6a4c4 /libs/gui/ConsumerBase.cpp
parent44c985ef7d0b6d94fa9df3fd5ea718eca0ecdbd1 (diff)
parentba7dc2db6e93a2407c8c328f2838591b7b760658 (diff)
am ba7dc2db: Merge "SurfaceFlinger: add support for secure displays" into jb-mr1-dev
* commit 'ba7dc2db6e93a2407c8c328f2838591b7b760658': SurfaceFlinger: add support for secure displays
Diffstat (limited to 'libs/gui/ConsumerBase.cpp')
0 files changed, 0 insertions, 0 deletions