am 98c531d: am 9b0c6be: Merge "Fix a compiling error when trying to use setBufferCount"

Jean-Baptiste Queru · Android Git Automerger · commit 3a5e36f96bf6 · 2011-08-02T17:19:05.000-07:00
* commit '98c531dca9e52af280ca002658bbe38775b3f6ae':
  Fix a compiling error when trying to use setBufferCount
diff --git a/include/gui/SurfaceTexture.h b/include/gui/SurfaceTexture.h
@@ -30,6 +30,7 @@ struct SurfaceTexture {
     void setFrameAvailableListener(const sp<FrameAvailableListener>&) {}
     void setSynchronousMode(bool) {}
     GLenum getCurrentTextureTarget() const { return 0; }
+    void setBufferCount(int bufferCount) {}
 };
 
 static sp<SurfaceTexture> SurfaceTexture_getSurfaceTexture(JNIEnv* env, jobject thiz)
