Merge commit '7f1ab539ceb56182d36d8782171a2dd84f96ea3b' into eclair-mr2-plus-aosp
* commit '7f1ab539ceb56182d36d8782171a2dd84f96ea3b':
docs: fix markup error in xml sample
Merge commit '7c09a0ff365d6df96e880422a7b389ddf63401da' into eclair-mr2-plus-aosp
* commit '7c09a0ff365d6df96e880422a7b389ddf63401da':
Remove old hack A/V sync hack that is no longer needed.
Merge commit '44000eb2a2340b1a47eaa587d4829810e04cbcdc' into eclair-mr2-plus-aosp
* commit '44000eb2a2340b1a47eaa587d4829810e04cbcdc':
Add WindowManagerPolicy.OFF_BECAUSE_OF_PROX_SENSOR to indicate screen was turned off by the proximity sensor.
Merge commit '6d1ec0d81cd8ecdd390b31e724bac554bb955a94' into eclair-mr2-plus-aosp
* commit '6d1ec0d81cd8ecdd390b31e724bac554bb955a94':
dealloc compiled-sql statements before deref'ing them from SQLiteDatabase obj.
Merge commit '5c49a9080df9e46193efa8326318c86bc8976eea' into eclair-mr2
* commit '5c49a9080df9e46193efa8326318c86bc8976eea':
DO NOT MERGE. Implement WAR which should prevent the white square bug from appearing on user devices. If we see a 0 texture id during bind for rendering, attempt to re-upload. If this fails log debug info and restart the app.
* changes:
DO NOT MERGE. Implement WAR which should prevent the white square bug from appearing on user devices. If we see a 0 texture id during bind for rendering, attempt to re-upload. If this fails log debug info and restart the app.
Merge commit '5d0806c9c3e0e6c8673ac4238f8ec2e0f82ad7e6' into eclair-mr2
* commit '5d0806c9c3e0e6c8673ac4238f8ec2e0f82ad7e6':
add BluetoothChat sample app to the dev guide
Merge commit '0a42b811aea490a9a605b75f0320101f6eafd283' into eclair-mr2
* commit '0a42b811aea490a9a605b75f0320101f6eafd283':
base: process: Abort setting the process group if one of the threads fails to switch
Merge commit '90d311ff33f33024f642ef03a02fb62566c9f46b' into eclair-mr2
* commit '90d311ff33f33024f642ef03a02fb62566c9f46b':
docs: fix markup error in xml sample
Merge commit '678c2e35768a5426b4ad8f67c836008e7751a353' into eclair-mr2
* commit '678c2e35768a5426b4ad8f67c836008e7751a353':
Add WindowManagerPolicy.OFF_BECAUSE_OF_PROX_SENSOR to indicate screen was turned off by the proximity sensor.
Merge commit 'a6c4556dea7d498783aff8a38e0e50c2b172beda'
* commit 'a6c4556dea7d498783aff8a38e0e50c2b172beda':
Make the notification panel send the position as well.
Merge commit '963559ec0a2a8eaf118b4bbcedaa7274ef8909f2'
* commit '963559ec0a2a8eaf118b4bbcedaa7274ef8909f2':
Make RemoteViews also set the sourceBounds in the PendingIntent.
Merge commit 'dbed53504f515337ccc2f60248bb589dff0f24fb'
* commit 'dbed53504f515337ccc2f60248bb589dff0f24fb':
Add a new field to Intent that allows you to give a hint about what on screen caused the intent to
Merge commit '64fc80823e1e954a419bdcb0a193e4c56a8da959' into eclair-mr2-plus-aosp
* commit '64fc80823e1e954a419bdcb0a193e4c56a8da959':
Document that stopPreview is not needed before takePicture.
Merge commit '40057ce749c8c4d274db0352a2af4344bda92dba' into eclair-mr2
* commit '40057ce749c8c4d274db0352a2af4344bda92dba':
Document that stopPreview is not needed before takePicture.
Merge commit 'a8974b637c384d10bac10d94fae7487afdb2c16d' into eclair-mr2-plus-aosp
* commit 'a8974b637c384d10bac10d94fae7487afdb2c16d':
Make the notification panel send the position as well.
Merge commit '19a4157ce40f4ab77b60445b8e73069c5877bb8a' into eclair-mr2
* commit '19a4157ce40f4ab77b60445b8e73069c5877bb8a':
Make the notification panel send the position as well.
Merge commit '6c5401d8b780d324afb784d4c0fba69cee4a6a9a' into eclair-mr2-plus-aosp
* commit '6c5401d8b780d324afb784d4c0fba69cee4a6a9a':
Make RemoteViews also set the sourceBounds in the PendingIntent.
Merge commit 'b28632a5206d11844db39ca1ab5f64a99ec74e29' into eclair-mr2-plus-aosp
* commit 'b28632a5206d11844db39ca1ab5f64a99ec74e29':
Add a new field to Intent that allows you to give a hint about what on screen caused the intent to
Merge commit '7597065d6b0877ffc460b443fdb1595965ccd7b2' into eclair-mr2
* commit '7597065d6b0877ffc460b443fdb1595965ccd7b2':
Make RemoteViews also set the sourceBounds in the PendingIntent.
Merge commit 'c7a63eea8d3d346addaaf892b5bbe0aa80651640' into eclair-mr2
* commit 'c7a63eea8d3d346addaaf892b5bbe0aa80651640':
Add a new field to Intent that allows you to give a hint about what on screen caused the intent to
Merge commit '2b3509c9a5d6f3a7142430cd0b81d135a9c0a5df' into eclair-mr2-plus-aosp
* commit '2b3509c9a5d6f3a7142430cd0b81d135a9c0a5df':
the vertex index should be "first + i".
Merge commit '1b04daf92b2f76da532c35e92eaa9ed2a9663d36' into eclair-mr2-plus-aosp
* commit '1b04daf92b2f76da532c35e92eaa9ed2a9663d36':
Fix bug 2216426: correct the hdpi star assets for RatingBar.
Merge commit 'de5343290c4bac9b10b6fdd328b70da6f5e4d626' into eclair-mr2
* commit 'de5343290c4bac9b10b6fdd328b70da6f5e4d626':
Fix bug 2216426: correct the hdpi star assets for RatingBar.