Merge commit '553a333d4446bb34330da92f02daa515dc597939'
* commit '553a333d4446bb34330da92f02daa515dc597939':
improve a bit the implementation of eglGetProcAddress
Merge commit '603a34ee30e7d14ddc02c1beb7bca915622ae4bf' into gingerbread-plus-aosp
* commit '603a34ee30e7d14ddc02c1beb7bca915622ae4bf':
improve a bit the implementation of eglGetProcAddress
Merge commit '4dc41bb445860cfcb8c0dfbecdc8f0f5f15f5e28'
* commit '4dc41bb445860cfcb8c0dfbecdc8f0f5f15f5e28':
We're now going to ignore timestamps completely in gtalk video conferencing, playing video as soon as it comes in. We also make up fake timestamps in the rtp code, ignoring rtcp SR information to enable early startup.
Merge commit '18f0174ff4eef46f121e77a0dc1d7a8271621f48' into gingerbread-plus-aosp
* commit '18f0174ff4eef46f121e77a0dc1d7a8271621f48':
We're now going to ignore timestamps completely in gtalk video conferencing, playing video as soon as it comes in. We also make up fake timestamps in the rtp code, ignoring rtcp SR information to enable early startup.
Merge commit '605f402796afa9c88e2f91284e98d1f59a0726aa' into gingerbread-plus-aosp
* commit '605f402796afa9c88e2f91284e98d1f59a0726aa':
Import revised translations. DO NOT MERGE
Merge commit '193985ffd553c139e8c1094d7798edbe5b0797c5'
* commit '193985ffd553c139e8c1094d7798edbe5b0797c5':
Many, many developers misread or don't read the http specs and terminate lines with '\n' instead of CRLF '\r\n' as required. Enable the workaround for this by default. Also increase the socket read timeout to 30 secs.
Merge commit '235be391f3b9cd79e525de87757e361ae044940d' into gingerbread-plus-aosp
* commit '235be391f3b9cd79e525de87757e361ae044940d':
Many, many developers misread or don't read the http specs and terminate lines with '\n' instead of CRLF '\r\n' as required. Enable the workaround for this by default. Also increase the socket read timeout to 30 secs.
Merge commit 'a04883412ec1a5dac3e83c3fd3c335ab9579a990'
* commit 'a04883412ec1a5dac3e83c3fd3c335ab9579a990':
Only check the codec specific data when the output buffer contains kKeyIsCodecConfig in MP4 writer
Merge commit '532d2ac5d5c06c3938c4999238d1051207bfe53c' into gingerbread-plus-aosp
* commit '532d2ac5d5c06c3938c4999238d1051207bfe53c':
Only check the codec specific data when the output buffer contains kKeyIsCodecConfig in MP4 writer
Merge commit '259b4c860212dd528b25d1cce6e74be01afed85c' into gingerbread-plus-aosp
* commit '259b4c860212dd528b25d1cce6e74be01afed85c':
SIP: clean up unused class and fields.
Merge commit '4a671a745202cb15cc668d46400731a03b068558'
* commit '4a671a745202cb15cc668d46400731a03b068558':
Update javadoc for the API and change return of getBondedDevices().
Merge commit '75493be9c0b4dd24fc5cddce6ee993ce5f0b2887'
* commit '75493be9c0b4dd24fc5cddce6ee993ce5f0b2887':
Make sure profiling is done only for views that are actually measured, laid out and drawn.
Merge commit '2f5f154d6a090b4ea2ee3645857f2fcae88daa54'
* commit '2f5f154d6a090b4ea2ee3645857f2fcae88daa54':
Fix bug 2684341 Don't steal the media button event from the phone
Merge commit '4e25db6a51c4182139b85e3b01317d161f944bbb'
* commit '4e25db6a51c4182139b85e3b01317d161f944bbb':
Check whether Bluetooth is enabled before making any API calls.
Merge commit 'e14923b0c80b2e73e69b7917c1f170b356592d29'
* commit 'e14923b0c80b2e73e69b7917c1f170b356592d29':
Support for extracting G.711 a-law and mu-law audio from WAV files and a corresponding software decoder.
Merge commit '745d1e905886ed0d8fa0a8590463093d125bc53a' into gingerbread-plus-aosp
* commit '745d1e905886ed0d8fa0a8590463093d125bc53a':
Update javadoc for the API and change return of getBondedDevices().
