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

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

am 57ea96a4: Reconcile with ics-mr1-release 

* commit '57ea96a4b3273aa8592873355a2f79c74b1abec1':
  SurfaceMediaSource: use the HW_TEXTURE usage bit
  SurfaceMediaSource: use the HW_TEXTURE usage bit
parents 6d4bf6ed a9798d3c
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