7ed9104c3a
Merge commit 'f6639c46e83a1ccab7b293192c208091d17c61be' into gingerbread-plus-aosp * commit 'f6639c46e83a1ccab7b293192c208091d17c61be': Finetune some rtsp timeout constants.