am 78a0a37b: Merge change 22144 into eclair
am 78a0a37b: Merge change 22144 into eclair

Merge commit '78a0a37b23ae438fa81855e52e625a04befe6dec'

* commit '78a0a37b23ae438fa81855e52e625a04befe6dec':
  Enable specification of http:// urls in stagefright commandline tool.

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