tree b162fe45a25d230aab143805e4d3c311fa4de30a
parent c24928fd6fc3555405ae1d9b8c1170ac221ce324
parent 22c67843bebd2083053af5992befe7ebd50303a5
author Mathias Agopian <mathias@google.com> 1291760336 -0800
committer Android (Google) Code Review <android-gerrit@google.com> 1291760336 -0800

Merge changes Ie03796ae,Ide3e980a into gingerbread

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