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)
commit154a7fbda9b704bc1d23b6f17573016ebb5989be
tree213424db0d71f1de94ea2789d272595287664bf6
parent6d4bf6eda04888144ec59cba4816a2cbb79b9e5c
parenta9798d3c1f1c9787975dc0f16e2191da95f2f0da
am 57ea96a4: Reconcile with ics-mr1-release

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