From: The Android Open Source Project <initial-contribution@android.com>
Date: Fri, 16 Dec 2011 16:09:57 +0000 (-0800)
Subject: am 57ea96a4: Reconcile with ics-mr1-release
X-Git-Tag: android-x86-4.4-r1~1579^2~349
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=154a7fbda9b704bc1d23b6f17573016ebb5989be;p=android-x86%2Fframeworks-av.git

am 57ea96a4: Reconcile with ics-mr1-release

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

154a7fbda9b704bc1d23b6f17573016ebb5989be