OSDN Git Service

(root) / android-x86 / frameworks-av.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 91a582c 1468dd9)
am 1468dd9c: am c582fde9: resolved conflicts for merge of c158971f to stage-aosp...
authorJean-Baptiste Queru <jbq@google.com>
Mon, 8 Jul 2013 20:43:29 +0000 (13:43 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 8 Jul 2013 20:43:29 +0000 (13:43 -0700)
* commit '1468dd9cefe11d5938a5497688f99701b6b14706':
  Store rtsp accessunit until PLAY response parsed


Trivial merge
frameworks/av
About OSDN
Find Software
Develop Software
Help