OSDN Git Service

am ba7dc2db: Merge "SurfaceFlinger: add support for secure displays" into jb-mr1-dev
authorJamie Gennis <jgennis@google.com>
Mon, 22 Oct 2012 20:54:50 +0000 (13:54 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 22 Oct 2012 20:54:50 +0000 (13:54 -0700)
* commit 'ba7dc2db6e93a2407c8c328f2838591b7b760658':
  SurfaceFlinger: add support for secure displays


Trivial merge