Merge commit '97ef7637c6799e72956db8e08192539f1b1942f6' into eclair-mr2-plus-aosp
* commit '97ef7637c6799e72956db8e08192539f1b1942f6':
- move the EventLog stuff out of ATSA
Merge commit 'b3c1f1cff4ecf5c88a0bd00d421beeb022bb41e4' into eclair-mr2-plus-aosp
* commit 'b3c1f1cff4ecf5c88a0bd00d421beeb022bb41e4':
move event log tags used by SyncAdapter into a local .logtags file
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 '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
Merge commit 'b43b5deff30d0ba77ea5b93d3e74507bfe2528be' into eclair-mr2-plus-aosp
* commit 'b43b5deff30d0ba77ea5b93d3e74507bfe2528be':
Paper over 2275704 by not having LotsOfApps installed on the monkeys builds.
Merge commit '3f40bd48d278a40603f3f7d7b9d602ecbc09246d' into eclair-mr2-plus-aosp
* commit '3f40bd48d278a40603f3f7d7b9d602ecbc09246d':
Remove the code where we suspect webkit draw during
Merge commit 'e6c0e99334bc2f47e5d36db253ac8f166047c03b' into eclair-mr2-plus-aosp
* commit 'e6c0e99334bc2f47e5d36db253ac8f166047c03b':
Optional use of UTF-8 strings in resource bundles
Merge commit '06ffc12a398bf16fb360d74b7511d946a73a741e' into eclair-mr2-plus-aosp
* commit '06ffc12a398bf16fb360d74b7511d946a73a741e':
Improve exception message thrown when a View's state is of the wrong type.
Merge commit '24eca800d4b34e7d13fbcbc1ab74c9d91ff6a4e1' into eclair-mr2-plus-aosp
* commit '24eca800d4b34e7d13fbcbc1ab74c9d91ff6a4e1':
Propagate background scheduling class across processes.
Merge commit '6be3bf2393030549306b438b9b17085035729135' into eclair-mr2-plus-aosp
* commit '6be3bf2393030549306b438b9b17085035729135':
Some fixes for positioning the WebTextView.
Merge commit 'f7d0b01387c10f93bf17981d45087810c80f0902' into eclair-mr2-plus-aosp
* commit 'f7d0b01387c10f93bf17981d45087810c80f0902':
Add TrafficStats class to SDK.
Merge commit '7c55c3f5f5997ca572d70ad513099a5af20a23c1' into eclair-mr2-plus-aosp
* commit '7c55c3f5f5997ca572d70ad513099a5af20a23c1':
Make sure to use the hand-tweaked-assembly version of the relevant mp3 code if building for ARM.
Merge commit '6d35d4c2cff4ad411fe7d6fde3fda0467d1016c5' into eclair-mr2-plus-aosp
* commit '6d35d4c2cff4ad411fe7d6fde3fda0467d1016c5':
Fix the mp3 audio extractor that would occasionally return an invalid frame directly after a seek.
Merge commit '3f5b28679bb31b8ba8f75a2bf330ec0dc0ea14cc' into eclair-mr2-plus-aosp
* commit '3f5b28679bb31b8ba8f75a2bf330ec0dc0ea14cc':
Minor tweaks to the mp3 and aac software decoders, propagate duration to output format.
Merge commit 'ee3a2443deb39ad9ce65293c045d34b9198cc57a' into eclair-mr2-plus-aosp
* commit 'ee3a2443deb39ad9ce65293c045d34b9198cc57a':
Note to self: Don't reverse the arguments to fseek(o)...
Merge commit '10c1dfad63ee7dace03b7914faf3c9891d096e25' into eclair-mr2-plus-aosp
* commit '10c1dfad63ee7dace03b7914faf3c9891d096e25':
Move the emergency call button to the top-right when there's no SIM.
Merge commit '51ef573a8336c637ac508c49b84b512d8f11fa3a' into eclair-mr2-plus-aosp
* commit '51ef573a8336c637ac508c49b84b512d8f11fa3a':
Switching from activity based full screen plugins to a view system overlay.
Merge commit '7e42e8f33446107d6abcbb69f4624abf1bba5fad' into eclair-mr2-plus-aosp
* commit '7e42e8f33446107d6abcbb69f4624abf1bba5fad':
Updating list of standard Intents in android.content.Intent
Merge commit 'ebc7799444ccd4d34863f1a07e885ca423a49c43' into eclair-mr2-plus-aosp
* commit 'ebc7799444ccd4d34863f1a07e885ca423a49c43':
Document that some parameters will not be null and fix getSupportedPictureFormats.
Merge commit '0766b2d0f398dcad10e332b695bbc0cbe5011882' into eclair-mr2-plus-aosp
* commit '0766b2d0f398dcad10e332b695bbc0cbe5011882':
Update service example code.
