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

Merge commit '5f96138ba65cecf38d0c752d87ad47d931db8775' into gingerbread-plus-aosp

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