tree 9048df91116828cc24e0796bc84bb3bfb99984c6
parent 56b6f9c33a8318db543a59b7da34fec0d50f8c44
parent 73e9a35c41efe4dac6b05387a9dafecdc662f140
author Andreas Huber <andih@google.com> 1337721721 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1337721721 -0700

am 73e9a35c: am 8d9846c0: Merge "Tell surface flinger that we want to protect output buffers from being" into jb-dev

* commit '73e9a35c41efe4dac6b05387a9dafecdc662f140':
  Tell surface flinger that we want to protect output buffers from being