Commits
The Android Open Source Project authored and Android Git Automerger committed 923635436b0M
am 57ea96a4: Reconcile with ics-mr1-release * commit '57ea96a4b3273aa8592873355a2f79c74b1abec1': SurfaceMediaSource: use the HW_TEXTURE usage bit SurfaceMediaSource: use the HW_TEXTURE usage bit
Showing diff to4868dfa33b5