OSDN Git Service

Merge "changes to SurfaceTexture needed for unification with SF"
authorMathias Agopian <mathias@google.com>
Tue, 19 Apr 2011 02:51:26 +0000 (19:51 -0700)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Tue, 19 Apr 2011 02:51:26 +0000 (19:51 -0700)
commit7e3d7f341ab3789fe25064670374159a35e35ed3
tree5684776c97f065ed1bee49b2cf2d6ca439f10cb7
parentb2ff74a35233e0a0411c7495e10a4653aeefa01e
parent7a042bf324fe3f3d5d4085fda21fe50dc0c362b4
Merge "changes to SurfaceTexture needed for unification with SF"
include/gui/SurfaceTexture.h
libs/gui/SurfaceTexture.cpp