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.
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.
Merge commit '1ee7b6453aaae47a6493a97790b9483aca1556c9' into eclair-mr2-plus-aosp
* commit '1ee7b6453aaae47a6493a97790b9483aca1556c9':
Close popup when Keyboard gets a CANCEL motion event.
Merge commit 'a5ba0a78811fcd5d3470bfa09df3e0106b77567e' into eclair-mr2-plus-aosp
* commit 'a5ba0a78811fcd5d3470bfa09df3e0106b77567e':
Make sure to acknowledge stale broadcasts
