Merge commit '9f1ea0d47f5aa18cf949593e6bfd36af9c6a55be'
* commit '9f1ea0d47f5aa18cf949593e6bfd36af9c6a55be':
Some fixes for positioning the WebTextView.
Merge commit '30807a4500fab8b46ee661db2ba99286049a8adc'
* commit '30807a4500fab8b46ee661db2ba99286049a8adc':
Make sure to use the hand-tweaked-assembly version of the relevant mp3 code if building for ARM.
Merge commit 'b16cf676bd3304bc0c5da4210d689f4e680219b1'
* commit 'b16cf676bd3304bc0c5da4210d689f4e680219b1':
Fix the mp3 audio extractor that would occasionally return an invalid frame directly after a seek.
Merge commit 'a42b8f160fb5906638e978a470972d1f50d749ac'
* commit 'a42b8f160fb5906638e978a470972d1f50d749ac':
Minor tweaks to the mp3 and aac software decoders, propagate duration to output format.
Merge commit '42be7440ee2a3a360c83802e4e7a2ecf40220eff'
* commit '42be7440ee2a3a360c83802e4e7a2ecf40220eff':
Note to self: Don't reverse the arguments to fseek(o)...
Merge commit 'f43eeef301cb5a0c24c95ffa0425fcabda905b8d'
* commit 'f43eeef301cb5a0c24c95ffa0425fcabda905b8d':
Move the emergency call button to the top-right when there's no SIM.
Merge commit '45ccb6a55e0c3ec23a5bbf710d0d170bc39985ed'
* commit '45ccb6a55e0c3ec23a5bbf710d0d170bc39985ed':
Switching from activity based full screen plugins to a view system overlay.
Merge commit '15650af4ab1df7fb84839162f9409d88cb4a3ccc'
* commit '15650af4ab1df7fb84839162f9409d88cb4a3ccc':
Updating list of standard Intents in android.content.Intent
Merge commit '90073aadd5dfdbb0e7ca9b53ae086536f976793f'
* commit '90073aadd5dfdbb0e7ca9b53ae086536f976793f':
Document that some parameters will not be null and fix getSupportedPictureFormats.
Merge commit '20db86042618e6ef422e28a9e328336b98d526b7'
* commit '20db86042618e6ef422e28a9e328336b98d526b7':
GpsLocationProvider: Do not release wakelock until the GPS engine is fully off
Merge commit 'b9b45a5e26ed020a39a507a173d9f29e336cf989' into eclair-plus-aosp
* commit 'b9b45a5e26ed020a39a507a173d9f29e336cf989':
Adding screenshots for development/samples/Wiktionary and development/samples/WiktionarySimple.
Merge commit '159f0015418955501d8cf2744b0393db2e73f394' into eclair-mr2-plus-aosp
* commit '159f0015418955501d8cf2744b0393db2e73f394':
Allow resource and file URIs in ImageView.setImageURI()
Merge commit '45e77ce36ae1d26bcf35afb1f7662d7b6fb08212' into eclair-mr2-plus-aosp
* commit '45e77ce36ae1d26bcf35afb1f7662d7b6fb08212':
Use unbundled QSB for global search
Merge commit '14f8940472217e8b0164d8f213679710d623d528' into eclair-plus-aosp
* commit '14f8940472217e8b0164d8f213679710d623d528':
Fix media player decode function. Bug 2317821.
Merge commit 'ed2a70d6495b3f1928e36ad2b00ee4d33b2c0379' into eclair-plus-aosp
* commit 'ed2a70d6495b3f1928e36ad2b00ee4d33b2c0379':
docs: add the Bluetooth developer guide,
Merge commit '282a742347bcb673f278c56b4dfede328a655296' into eclair-plus-aosp
* commit '282a742347bcb673f278c56b4dfede328a655296':
Import revised translations. DO NOT MERGE
Merge commit 'f6e32e72a902d9a309410bc5306a539ea850159f' into eclair-plus-aosp
* commit 'f6e32e72a902d9a309410bc5306a539ea850159f':
Maintain a list of all Bluetooth docks.
Merge commit '76169da0e84b0fcf621aeac6141af3ee85bc7c1e' into eclair-plus-aosp
* commit '76169da0e84b0fcf621aeac6141af3ee85bc7c1e':
fix [2315900] Monochrome camera preview screen after launching camera
Merge commit '7cd4029473431c56100e52f631b9733829dc3171' into eclair-mr2-plus-aosp
* commit '7cd4029473431c56100e52f631b9733829dc3171':
Add convenience function to MediaStore to move a playlist item
Merge commit '5f68d6fafc29bb14b4b407b4221395332409fc9c' into eclair-mr2-plus-aosp
* commit '5f68d6fafc29bb14b4b407b4221395332409fc9c':
Enable longpress and doubletap to WebKit as touch
Merge commit '328c0e7986aa6bb7752ec6de3da9c999920bb55f' into eclair-mr2-plus-aosp
* commit '328c0e7986aa6bb7752ec6de3da9c999920bb55f':
- removed the concept of Entity from the ContentProvider APIs
Merge commit 'a50d450863cb84805ac6809a4c1f7b83984da1ee' into eclair-mr2-plus-aosp
* commit 'a50d450863cb84805ac6809a4c1f7b83984da1ee':
Check that the resolved activity is not in our package.
Merge commit '47fabbfcbf99e5e3b73a6ee09059c77932ef1b7b' into eclair-mr2-plus-aosp
* commit '47fabbfcbf99e5e3b73a6ee09059c77932ef1b7b':
Pass a message to move the focus when user hits "Next".
Merge commit 'aa396b9610f339cf280159144fbea47506f060e7' into eclair-mr2-plus-aosp
* commit 'aa396b9610f339cf280159144fbea47506f060e7':
Unhide the Android OpenGL ES 2.0 API
Merge commit '0dce2dd26699e4dbfba8b8c5ea01f7fd03369e02' into eclair-mr2-plus-aosp
* commit '0dce2dd26699e4dbfba8b8c5ea01f7fd03369e02':
Extend GLSurfaceView to make it easy to create an OpenGL ES 2.0 context
Merge commit '3608891b83af9fbd1af9b9a411f2a90e52353ff8' into eclair-mr2-plus-aosp
* commit '3608891b83af9fbd1af9b9a411f2a90e52353ff8':
Add a Java API for OpenGL ES 2.0.
