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)
* commit '0cc1e42d74e09c259a6da0abc9009d1abf7537b1':
  SurfaceMediaSource: use the HW_TEXTURE usage bit


Trivial merge