tree 6c5bf9a44339fbf7064fa9ba913dcbd1736613b6
parent 7779a4404345e18674105cb362bbc6470b5e5737
parent 0ed90b7894bff07e64133bad55f5bcccaf2cf491
author Derek Sollenberger <djsollen@google.com> 1311958211 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1311958211 -0700

am 01caec8c: Merge "Adding an optional param to the SurfaceTexture constructor."

* commit '01caec8c4165a6cce2f276f8016b9eadab966944':
  Adding an optional param to the SurfaceTexture constructor.