OSDN Git Service

am 9aba2324: Merge "Add getTransformMatrix to the SurfaceTexture API." into honeycomb
authorJamie Gennis <jgennis@google.com>
Thu, 13 Jan 2011 19:31:03 +0000 (11:31 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 13 Jan 2011 19:31:03 +0000 (11:31 -0800)
* commit '9aba2324ac8d7216732b42346bfcaf0be71eb22e':
  Add getTransformMatrix to the SurfaceTexture API.


Trivial merge