Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit bbe0e6cd authored by The Android Open Source Project's avatar The Android Open Source Project Committed by Android Git Automerger
Browse files

am 92363543: am 57ea96a4: Reconcile with ics-mr1-release 

* commit '923635436b0cd3392f3aa9328a4a855e5000dfb5':
  SurfaceMediaSource: use the HW_TEXTURE usage bit
  SurfaceMediaSource: use the HW_TEXTURE usage bit
parents 4f9a5d61 b04316c7
Show whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment