am 3e22ef1e: Merge "Better handling of rtsp connection and disconnection." into gingerbread

Merge commit '3e22ef1e111966df6ad527632fdc35d105c73916' into gingerbread-plus-aosp

* commit '3e22ef1e111966df6ad527632fdc35d105c73916':
  Better handling of rtsp connection and disconnection.