am 48ac68e1: Merge "Support for RFC3640 - mpeg4-generic RTP packet type,...
am 48ac68e1: Merge "Support for RFC3640 - mpeg4-generic RTP packet type, AAC-lbr and AAC-hbr." into gingerbread
Merge commit '48ac68e1' into gingerbread-plus-aosp
* commit '48ac68e1':
Support for RFC3640 - mpeg4-generic RTP packet type, AAC-lbr and AAC-hbr.