am 5f96138b: Merge "Support getting codec, width, and height in URL for gtalk...
am 5f96138b: Merge "Support getting codec, width, and height in URL for gtalk playback." into gingerbread
Merge commit '5f96138b' into gingerbread-plus-aosp
* commit '5f96138b':
Support getting codec, width, and height in URL for gtalk playback.