OSDN Git Service

am 4e345ab7: (-s ours) am a2977c38: Merge changes Ie03796ae,Ide3e980a into gingerbread
authorMathias Agopian <mathias@google.com>
Wed, 8 Dec 2010 07:00:20 +0000 (23:00 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 8 Dec 2010 07:00:20 +0000 (23:00 -0800)
* commit '4e345ab7df737592528e99db73612c6b37e34545':
  [3171580] SurfaceFlinger Bypass mode. (DO NOT MERGE)
  [3171580] Add transform field to native buffers. (DO NOT MERGE)


Trivial merge