tree c5f62a947aa04afb4e3f5f8f8ddbb569ff8fa0c0
parent 3453bf678e3d0187015cdde1c9263299ea361726
parent 69aac3e6cd68e8c305a41b2677123db7662efd4b
author Dave Burke <daveburke@google.com> 1324005907 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1324005907 -0800

am ac279de9: Merge "SurfaceMediaSource: use the HW_TEXTURE usage bit" into ics-mr1

* commit 'ac279de9d9fcfd59a336298cfdd5b1f4ab6d038f':
  SurfaceMediaSource: use the HW_TEXTURE usage bit