am 44874c2: am c962512: Merge "added stub for getting buffer from surface texture"

* commit '44874c236de282b0d898f179fc9fdafa84aae40d':
  added stub for getting buffer from surface texture

Author: Jean-Baptiste Queru

include/gui/SurfaceTexture.h

@@ -31,6 +31,7 @@ struct SurfaceTexture {
     void setSynchronousMode(bool) {}
     GLenum getCurrentTextureTarget() const { return 0; }
     void setBufferCount(int bufferCount) {}
+    sp<GraphicBuffer> getCurrentBuffer() const { return NULL; }
 };
 
 static sp<SurfaceTexture> SurfaceTexture_getSurfaceTexture(JNIEnv* env, jobject thiz)