tree 0d9a06a6c3c8df382f92e5d834f8ef5b2156c8ef
parent f9e2ca326f565e4012f83da25068c00edb087e94
parent 4e345ab7df737592528e99db73612c6b37e34545
author Mathias Agopian <mathias@google.com> 1291791620 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1291791620 -0800

am 4e345ab7: (-s ours) am a2977c38: Merge changes Ie03796ae,Ide3e980a into gingerbread

* commit '4e345ab7df737592528e99db73612c6b37e34545':
  [3171580] SurfaceFlinger Bypass mode. (DO NOT MERGE)
  [3171580] Add transform field to native buffers. (DO NOT MERGE)