commit 3a5e36f96bf61a8fb71c49cf93bd97c5e1d6abb4
author Jean-Baptiste Queru <jbq@google.com> Tue Aug 02 17:19:05 2011 -0700
committer Android Git Automerger <android-git-automerger@android.com> Tue Aug 02 17:19:05 2011 -0700
tree 32f83006fd40076bb74d5b5764595127efd7f4f2
parent f8c1f1298ac3ede518c8d29eeb6719746c6afaf0
parent 98c531dca9e52af280ca002658bbe38775b3f6ae

am 98c531dc: am 9b0c6bee: Merge "Fix a compiling error when trying to use setBufferCount"

* commit '98c531dca9e52af280ca002658bbe38775b3f6ae':
  Fix a compiling error when trying to use setBufferCount

include/gui/SurfaceTexture.h

diff --git a/include/gui/SurfaceTexture.h b/include/gui/SurfaceTexture.h
index 946afb9..ec62b96 100644
--- a/include/gui/SurfaceTexture.h
+++ b/include/gui/SurfaceTexture.h
@@ -30,6 +30,7 @@
     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)