Merge commit '3aad8c38520956708e51882f3fad63a7a217e8e4' into gingerbread-plus-aosp
* commit '3aad8c38520956708e51882f3fad63a7a217e8e4':
Fix an issue where the track duration does not include the last sample duration
Merge commit '4ae1e382f4b6c5bb9e757f35f82ad48dc02c32af' into gingerbread-plus-aosp
* commit '4ae1e382f4b6c5bb9e757f35f82ad48dc02c32af':
Tracking merge of dalvik-dev to gingerbread
Merge commit '2c37f3d3a09188f3dc66e177547709e4828918be' into gingerbread-plus-aosp
* commit '2c37f3d3a09188f3dc66e177547709e4828918be':
Better support for fake timestamps in RTP, H.263 video now also requests FIR.
Merge commit '407ec58c6604da3255b04aa99577515deba3a26f' into gingerbread-plus-aosp
* commit '407ec58c6604da3255b04aa99577515deba3a26f':
A better fix for the OggExtractor referring to the sample rate while it hasn't been initialized yet.
Merge commit 'fb861523318710b95c08110b9b2de28f7da74a40' into gingerbread-plus-aosp
* commit 'fb861523318710b95c08110b9b2de28f7da74a40':
Specification of codec specific data as part of the session description is now optional.
Merge commit '468e35efc595114354eff7ee2685ea79ed098c7f' into gingerbread-plus-aosp
* commit '468e35efc595114354eff7ee2685ea79ed098c7f':
Move SIP telephony related codes to framework.
Merge commit '8c5035696b0aaf30ae49594b845f663fe633ac88' into gingerbread-plus-aosp
* commit '8c5035696b0aaf30ae49594b845f663fe633ac88':
Move the sip related codes to framework.
Merge commit '97c2d840a10813164d82571775a3566637d6c5de' into gingerbread-plus-aosp
* commit '97c2d840a10813164d82571775a3566637d6c5de':
fix some doc errors in the resources;
Merge commit '8dd87ad9440bc63bc312b06f292adcd2642b1c41' into gingerbread
* commit '8dd87ad9440bc63bc312b06f292adcd2642b1c41':
fix some doc errors in the resources;
In the success case, the 65kB scanBuf was not freed!
Also, get rid of annoying complaints about ssize_t from printf in error
cases.
Change-Id: If154ac19bf47637f898b4ec8c8e27c9a073a7b81
Merge commit '125816a2a89343efdcccc5a74c2dd8a2608c54a0' into gingerbread-plus-aosp
* commit '125816a2a89343efdcccc5a74c2dd8a2608c54a0':
Failure to move .dex in eng builds is not fatal
Merge commit '82cadee3ca830315c617dfdbf3a8eef207c58436' into gingerbread-plus-aosp
* commit '82cadee3ca830315c617dfdbf3a8eef207c58436':
Add support for PSC of serving cell.
Merge commit '86d2c088f15e0df33d5f81bece1c2f088632cc2c' into gingerbread-plus-aosp
* commit '86d2c088f15e0df33d5f81bece1c2f088632cc2c':
Don't return a decoder error if the encoded stream does not start with SPS/PPS.
Merge commit 'c17f35dd927570c5c8d0c00b25a5bfaa1d4f1444' into gingerbread-plus-aosp
* commit 'c17f35dd927570c5c8d0c00b25a5bfaa1d4f1444':
Support for Gtalk video, includes AMR/H.263 assembler and packetization support, extensions to MediaRecorder to stream via RTP over a pair of UDP sockets as well as various fixes to the RTP implementation.
Merge commit '508715259c332613240b2399c77d35ea7214f91a' into gingerbread-plus-aosp
* commit '508715259c332613240b2399c77d35ea7214f91a':
Add more debugging to installd
Merge commit 'd89443d86603dbc9e02e1db32b9071780b4702bc' into gingerbread-plus-aosp
* commit 'd89443d86603dbc9e02e1db32b9071780b4702bc':
Import revised translations. DO NOT MERGE
Merge commit 'c68bcc320522abf856211e9aa00bba71ccaddacb' into gingerbread-plus-aosp
* commit 'c68bcc320522abf856211e9aa00bba71ccaddacb':
Only allow one movePackage operation in-flight
