| commit | 1468dd9cefe11d5938a5497688f99701b6b14706 | [log] [tgz] |
|---|---|---|
| author | Jean-Baptiste Queru <jbq@google.com> | Mon Jul 08 13:42:25 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Jul 08 13:42:25 2013 -0700 |
| tree | 1f4bebe3e7480d719ed2431427db16475730558e | |
| parent | 8ebdfa8b021ed338f9916a1f30d756b989afa3bd [diff] | |
| parent | c582fde93ded7219107157333a9e46d780adcf9c [diff] |
am c582fde9: resolved conflicts for merge of c158971f to stage-aosp-master * commit 'c582fde93ded7219107157333a9e46d780adcf9c': Store rtsp accessunit until PLAY response parsed