am 2f020449: am 5f96138b: Merge "Support getting codec, width, and height in URL for gtalk playback." into gingerbread

Merge commit '2f02044944d5c526020d4e8cceaae7e77382d56d'

* commit '2f02044944d5c526020d4e8cceaae7e77382d56d':
  Support getting codec, width, and height in URL for gtalk playback.
tree: d8e99c2428081a94d521bf51694e1946aa5d3688
  1. camera/
  2. cmds/
  3. include/
  4. media/
  5. services/