tree 70b108748707e0310e6c135617e42ed3a9b0d95e
parent aeb06e34085703fe9699cdc3454558d69092bd7c
parent 09fc76664add0d2aa776d0fa410950be9bc8f973
author Dave Burke <daveburke@google.com> 1324005806 -0800
committer Android (Google) Code Review <android-gerrit@google.com> 1324005806 -0800

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