OSDN Git Service

am c582fde9: resolved conflicts for merge of c158971f to stage-aosp-master
authorJean-Baptiste Queru <jbq@google.com>
Mon, 8 Jul 2013 20:42:25 +0000 (13:42 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 8 Jul 2013 20:42:25 +0000 (13:42 -0700)
commit1468dd9cefe11d5938a5497688f99701b6b14706
tree1f4bebe3e7480d719ed2431427db16475730558e
parent8ebdfa8b021ed338f9916a1f30d756b989afa3bd
parentc582fde93ded7219107157333a9e46d780adcf9c
am c582fde9: resolved conflicts for merge of c158971f to stage-aosp-master

* commit 'c582fde93ded7219107157333a9e46d780adcf9c':
  Store rtsp accessunit until PLAY response parsed