Merge commit '149c0543a3d5f450686b7c3d142ac5f8fcf61ed4'
* commit '149c0543a3d5f450686b7c3d142ac5f8fcf61ed4':
Partial fix for 2069703: Fix race condition in KeyguardViewManager.hide() that could result in a blank screen.
Merge commit 'e52d5ffb43f6cd6c2e37c4e636e39162464cfcf5'
* commit 'e52d5ffb43f6cd6c2e37c4e636e39162464cfcf5':
Revert "temporarily disable the use of glTexImage2D for sw buffers on sholes."
Merge commit 'dba9981588503dbfc442216a857ff001f46fff60'
* commit 'dba9981588503dbfc442216a857ff001f46fff60':
Fix failing unit test; the test was using a deprecated API making it fail on WVGA devices.
Merge commit '84a379cc0615b2c1682d99ed286c6d3cb2e114fe'
* commit '84a379cc0615b2c1682d99ed286c6d3cb2e114fe':
temporarily disable the use of glTexImage2D for sw buffers on sholes.
Merge commit '98b3def2983e78409002cf406574bbc8eeef8bfd' into eclair-mr2
* commit '98b3def2983e78409002cf406574bbc8eeef8bfd':
Revert "egl: temporarily also include eglTerminate->eglInitialize hack for 8k"
Merge commit '98b3def2983e78409002cf406574bbc8eeef8bfd' into eclair-plus-aosp
* commit '98b3def2983e78409002cf406574bbc8eeef8bfd':
Revert "egl: temporarily also include eglTerminate->eglInitialize hack for 8k"
Merge commit 'bd5662a1a2e74f1be1e0a0fb4858835caf10c315' into eclair-mr2-plus-aosp
* commit 'bd5662a1a2e74f1be1e0a0fb4858835caf10c315':
add local flag to enable FPS w/o having to enable Config.DEBUG, which can have unintended costs
Merge commit '2e9ca540fc15da4363111860949136e61b816dac'
* commit '2e9ca540fc15da4363111860949136e61b816dac':
Fix tls crash on startup if more than one RS contexts are created in one process.
Merge commit '35a82b6b5be55287589028e1f8874b65f50245f4'
* commit '35a82b6b5be55287589028e1f8874b65f50245f4':
Fixed issue #4098: Ringtone#getTitle does not close its cursor.
Merge commit '2f2634e5be65c56f93d3fc3a97e25c546e3bc8bc'
* commit '2f2634e5be65c56f93d3fc3a97e25c546e3bc8bc':
Add group id to getThumbnail and cancelThumbnailRequest API.
Merge commit 'ed2247dc685233b82c7769a5e17f103c1c603ab9'
* commit 'ed2247dc685233b82c7769a5e17f103c1c603ab9':
Fix for bug 2158794. Hide MediaPlayer.invoke() and MediaPlayer.newRequest(), and Fix bad links in ToneGenerator documentation.
Merge commit '66ce0f07fcb79b97dc52aa0a1c5fce1565f4f090'
* commit '66ce0f07fcb79b97dc52aa0a1c5fce1565f4f090':
Add a test to make sure the replaced classes in layoutlib are correct.
Merge commit '2a9b411d4ed60acbe089068c93850ecd049f57f2'
* commit '2a9b411d4ed60acbe089068c93850ecd049f57f2':
Turn some logging back on in ConnectionManager
Merge commit 'c5f2aae4da0a0aef635453bbd86b570e46b66bb2'
* commit 'c5f2aae4da0a0aef635453bbd86b570e46b66bb2':
Implement data push from scripts. Fixes the problem where apps would have to poll to monitor a scripts state.
Merge commit '5a535026bfc1d091c0d029b21cc63f929c2def0a'
* commit '5a535026bfc1d091c0d029b21cc63f929c2def0a':
Make sdk version and code names static finals in PackageParser.
Merge commit '4613007b5755ed95a3a649909b4702400863f9b4'
* commit '4613007b5755ed95a3a649909b4702400863f9b4':
Make VCardComposer create the instance for mHandlerList.
Merge commit 'c42268d25497d8093403bbe9f3ea63dad21b68e2'
* commit 'c42268d25497d8093403bbe9f3ea63dad21b68e2':
Hold a partial wakelock while showing the keyguard
Merge commit '3557d5bc9eb8ac33641430ca52d8e2121d0f1a4b'
* commit '3557d5bc9eb8ac33641430ca52d8e2121d0f1a4b':
Reimplement all the method of Paint for layoutlib
Merge commit 'a1cb6a64c6710d46cc8673bc17db3bdb5c7bbc09'
* commit 'a1cb6a64c6710d46cc8673bc17db3bdb5c7bbc09':
Provide an API for apps to use a dynamic RFCOMM channel and SDP record.
Merge commit '2d0dee0e6ccebced9eac11dec24fbb66a1a40b2b'
* commit '2d0dee0e6ccebced9eac11dec24fbb66a1a40b2b':
dumpstate: Emit a logcat message at beginning and end of execution.
Merge commit '636d9cd63b77a87e6cb627a90cc8f37e81bedb14'
* commit '636d9cd63b77a87e6cb627a90cc8f37e81bedb14':
Fix the layoutlib test to run from adt-tests.
Merge commit '4bc6158d6bdeff796cfd61d489c01db0d203534c'
* commit '4bc6158d6bdeff796cfd61d489c01db0d203534c':
Fix issue #2166755: BroadcastReceiver trying to return result during a non-ordered broadcast
Merge commit 'e1bf39bc764c78344dd2a6c59c5709919bdc1da9'
* commit 'e1bf39bc764c78344dd2a6c59c5709919bdc1da9':
Make sure AsyncTask sens a null result to onPostExecute() when cancelled.
Merge commit '36cad7be504608a538c845b4a44f0dcee157a338'
* commit '36cad7be504608a538c845b4a44f0dcee157a338':
Add cancel() VCardDataBuilder, which is intended to remove
Merge commit '515c82cdde6334778d8a75a7ad0bbb97271bed88'
* commit '515c82cdde6334778d8a75a7ad0bbb97271bed88':
Add some logging to help diagnose b/2164183
