am 2f020449: am 5f96138b: Merge "Support getting codec, width, and height in URL for gtalk playback." into gingerbread
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.

xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base