OSDN Git Service

am 9e2949c6: am 2375d163: Merge "Send RTSP control connection keep-alive requests...
authorAndreas Huber <andih@google.com>
Thu, 10 Nov 2011 19:39:38 +0000 (19:39 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 10 Nov 2011 19:39:38 +0000 (19:39 +0000)
* commit '9e2949c6ab4e791b5c20d5e85c3eff62f206a99b':
  Send RTSP control connection keep-alive requests

1  2 
media/libstagefright/rtsp/MyHandler.h

Simple merge