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

* commit '01caec8c4165a6cce2f276f8016b9eadab966944':
  Adding an optional param to the SurfaceTexture constructor.
This commit is contained in:
Derek Sollenberger
2011-07-29 09:50:11 -07:00
committed by Android Git Automerger

View File

@@ -22,7 +22,7 @@ namespace android {
struct SurfaceTexture {
struct FrameAvailableListener : public virtual RefBase {};
SurfaceTexture(GLuint) {}
SurfaceTexture(GLuint, bool allowSynchronousMode = true) {}
void updateTexImage() {}
void decStrong(android::sp<android::SurfaceTexture>* const) {}
void incStrong(android::sp<android::SurfaceTexture>* const) {}