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