| commit | 9046684244e6adaf4db46f1a5e5b1fea221cd781 | [log] [tgz] |
|---|---|---|
| author | Jean-Baptiste Queru <jbq@google.com> | Mon Jul 08 13:43:29 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Jul 08 13:43:29 2013 -0700 |
| tree | 6485364758416639bcbfc8c74c7db2f25234b3ae | |
| parent | 91a582c46758949c8ac205507d72595c8c0fe1f3 [diff] | |
| parent | 1468dd9cefe11d5938a5497688f99701b6b14706 [diff] |
am 1468dd9c: am c582fde9: resolved conflicts for merge of c158971f to stage-aosp-master * commit '1468dd9cefe11d5938a5497688f99701b6b14706': Store rtsp accessunit until PLAY response parsed