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

* commit '0cc1e42d74e09c259a6da0abc9009d1abf7537b1':
  SurfaceMediaSource: use the HW_TEXTURE usage bit
tree: 792f55bb343fc5f989e7f5d110194da4a57dd651
  1. camera/
  2. cmds/
  3. drm/
  4. include/
  5. media/
  6. services/