Merge commit '0f62abd986e1900ab4260e559b2dc7d917b6470f'
* commit '0f62abd986e1900ab4260e559b2dc7d917b6470f':
Fix#2313382: SECURITY: Live wallpapers get touch events through the lock screen.
Merge commit '274b8c584161342af2d1f6dc616995d98f6796ad'
* commit '274b8c584161342af2d1f6dc616995d98f6796ad':
Fix the build when ViewDebug.TRACE_RECYCLER is set to true.
Merge commit '9f4cea6846aa4ac2ec57c97f5da17822eb9b9727'
* commit '9f4cea6846aa4ac2ec57c97f5da17822eb9b9727':
Telephony: Make resetting radio on a radio technology change optional
Merge commit 'eb68a226563f60265663f1688dda77c4f909e5de'
* commit 'eb68a226563f60265663f1688dda77c4f909e5de':
Add bindService API to not bring ot foreground.
Merge commit '774568f73911ae2bb35c816a40d49376ea8300df'
* commit '774568f73911ae2bb35c816a40d49376ea8300df':
Close popup when Keyboard gets a CANCEL motion event.
Merge commit 'c97c5c0b9b61f48cbf47cb95d497e0bb6d01eeef'
* commit 'c97c5c0b9b61f48cbf47cb95d497e0bb6d01eeef':
Paper over 2275704 by not having LotsOfApps installed on the monkeys builds.
Merge commit '506afbd600d82a324f59ceb875f664ead4338600'
* commit '506afbd600d82a324f59ceb875f664ead4338600':
Remove the code where we suspect webkit draw during
Merge commit '5cd6fcd518d47d1974a10fccf3c3d5431a83307a'
* commit '5cd6fcd518d47d1974a10fccf3c3d5431a83307a':
Optional use of UTF-8 strings in resource bundles
Merge commit '8f4bca2acada86c36c7de59e8891ef120098aa19'
* commit '8f4bca2acada86c36c7de59e8891ef120098aa19':
Improve exception message thrown when a View's state is of the wrong type.
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 '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.
Merge commit '4c8454d8699cbedf473565bb92a80defaf95af09' into eclair-mr2-plus-aosp
* commit '4c8454d8699cbedf473565bb92a80defaf95af09':
Fix#2313382: SECURITY: Live wallpapers get touch events through the lock screen.
Merge commit '114800653ca4575ec485a04c64889d98b40237e4' into eclair-mr2-plus-aosp
* commit '114800653ca4575ec485a04c64889d98b40237e4':
Add new white style for ExpandableListView.
Merge commit '7b935e84264fa1cfe36a1fa9f8cb5954d09cb9ef' into eclair-mr2-plus-aosp
* commit '7b935e84264fa1cfe36a1fa9f8cb5954d09cb9ef':
Fix the build when ViewDebug.TRACE_RECYCLER is set to true.
Merge commit 'a41e068045dabe510aa36fa829acf693f6c9cae1' into eclair-mr2-plus-aosp
* commit 'a41e068045dabe510aa36fa829acf693f6c9cae1':
Telephony: Make resetting radio on a radio technology change optional
Merge commit 'b882b361f123e4ef7870c99e8a9fd9e1be48e396' into eclair-mr2-plus-aosp
* commit 'b882b361f123e4ef7870c99e8a9fd9e1be48e396':
Deleted Gmail.java from frameworks. Previously it had been moved to vendor/google/.../Gmail/...
Merge commit 'af9788a9d6c238dd97f40dc020e036739daf0811' into eclair-mr2-plus-aosp
* commit 'af9788a9d6c238dd97f40dc020e036739daf0811':
Add bindService API to not bring ot foreground.
Merge commit '7614d3d819315b1ca15088e617f12d0f0ea41b06' into eclair-mr2-plus-aosp
* commit '7614d3d819315b1ca15088e617f12d0f0ea41b06':
Porting change I064698b3 from mr2 to eclair.
