OSDN Git Service

am 0cc1e42d: am ac279de9: Merge "SurfaceMediaSource: use the HW_TEXTURE usage bit...
authorDave Burke <daveburke@google.com>
Fri, 16 Dec 2011 03:27:17 +0000 (19:27 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 16 Dec 2011 03:27:17 +0000 (19:27 -0800)
commit255adceb85bc23de61fb138ddb474852514b3b33
tree792f55bb343fc5f989e7f5d110194da4a57dd651
parent079123ee3d2e20bbc17a7ddbd96ca46bed27898f
parent7e2f99569ae7d22307957abecc2e1818b4e7ab5e
am 0cc1e42d: am ac279de9: Merge "SurfaceMediaSource: use the HW_TEXTURE usage bit" into ics-mr1

* commit '0cc1e42d74e09c259a6da0abc9009d1abf7537b1':
  SurfaceMediaSource: use the HW_TEXTURE usage bit
media/libstagefright/SurfaceMediaSource.cpp