OSDN Git Service

am b7ed8471: am 01caec8c: Merge "Adding an optional param to the SurfaceTexture const...
authorDerek Sollenberger <djsollen@google.com>
Fri, 29 Jul 2011 16:53:09 +0000 (09:53 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 29 Jul 2011 16:53:09 +0000 (09:53 -0700)
* commit 'b7ed8471f1b96aff901149cf9ac29e4b32672f93':
  Adding an optional param to the SurfaceTexture constructor.


Trivial merge