tree bcf05782961e3783a251d588978d7baf87e6a4c4
parent 44c985ef7d0b6d94fa9df3fd5ea718eca0ecdbd1
parent ba7dc2db6e93a2407c8c328f2838591b7b760658
author Jamie Gennis <jgennis@google.com> 1350939290 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1350939290 -0700

am ba7dc2db: Merge "SurfaceFlinger: add support for secure displays" into jb-mr1-dev

* commit 'ba7dc2db6e93a2407c8c328f2838591b7b760658':
  SurfaceFlinger: add support for secure displays