OSDN Git Service

am 57ea96a4: Reconcile with ics-mr1-release
authorThe Android Open Source Project <initial-contribution@android.com>
Fri, 16 Dec 2011 16:09:57 +0000 (08:09 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 16 Dec 2011 16:09:57 +0000 (08:09 -0800)
commitb04316c746ff3df93fdb9bdcd3f8f9d603f00ed8
tree76a85ebc08e2538fb6a27cea972455efcc38a856
parentb28f824856a0b349d2a8866deecd8a89dd9fc287
parent7e97651fe39de4b3630f8d5bea146db3225cfccd
am 57ea96a4: Reconcile with ics-mr1-release

* commit '57ea96a4b3273aa8592873355a2f79c74b1abec1':
  SurfaceMediaSource: use the HW_TEXTURE usage bit
  SurfaceMediaSource: use the HW_TEXTURE usage bit