am 573c5d5e: am 46b84d5b: Merge "Add MediaStore.ACTION_MEDIA_PLAY_FROM_SEARCH intent for open-ended search and play of music. This is used, for instance, by Google\'s new "listen to" Voice Action." into gingerbread

Merge commit '573c5d5edc1f51fd026e1d0e17ab883403eeddd9'

* commit '573c5d5edc1f51fd026e1d0e17ab883403eeddd9':
  Add MediaStore.ACTION_MEDIA_PLAY_FROM_SEARCH intent for open-ended
tree: 5625a7b7cb55d7110ae1f6ede1b8ad61f532447e
  1. cmds/
  2. include/
  3. libs/
  4. opengl/
  5. services/
  6. vpn/
  7. MODULE_LICENSE_APACHE2
  8. NOTICE