Merge commit 'b392c53f1f0bf3c757496295d5ad7a7d00ef151a' into eclair-plus-aosp
* commit 'b392c53f1f0bf3c757496295d5ad7a7d00ef151a':
Set BondState to Bonding only if it not Bonded already.
Merge commit '98a9c56acf1857adaf1773bd91c88a8364fd3fa8' into eclair-plus-aosp
* commit '98a9c56acf1857adaf1773bd91c88a8364fd3fa8':
attempt to work around [2155085, 2150246] stuck in closeTransaction()
Merge commit 'a33e3f79259b56b03c7912af35944f34ad190e3c' into eclair-plus-aosp
* commit 'a33e3f79259b56b03c7912af35944f34ad190e3c':
Fix issue #2154794: Force close when start facebook application.
Merge commit '46e462a380f90ed8101f9ac3f950a3c702772842' into eclair-plus-aosp
* commit '46e462a380f90ed8101f9ac3f950a3c702772842':
Only re-initialize backup state if @pm@ metadata is missing,
* changes:
Only re-initialize backup state if @pm@ metadata is missing, to defensively work around a still-mysterious bug where the list of saved packages ends up being empty even though we still have state pending. If we do re-initialize, then wipe all state to make sure the right thing happens.
Merge commit '935cbda0df2d55247c30d65534ecf31b1ee164b5' into eclair-plus-aosp
* commit '935cbda0df2d55247c30d65534ecf31b1ee164b5':
Debugging for #2027266: app drawer showing up on the side
Merge commit 'd2c494d9be366aed081742c097b97816a6ed9d44' into eclair-plus-aosp
* commit 'd2c494d9be366aed081742c097b97816a6ed9d44':
add class description and revise descriptions for
Merge commit 'e4d51bb2a9706a08c3160eb39e076a89c225257c' into eclair-plus-aosp
* commit 'e4d51bb2a9706a08c3160eb39e076a89c225257c':
fix [2152247] Windows sometimes drawn scaled up.
invalidate the surface when the physical changes
introduce the notion of the requested size in the Layer state
remove unused code
Merge commit '17d262f2322258ab88ba2b012c10df37d207ba99' into eclair-plus-aosp
* commit '17d262f2322258ab88ba2b012c10df37d207ba99':
Fix for 2155255: Revert "Cache inflated view to avoid inflation of layouts in preferences"
* changes:
fix [2152247] Windows sometimes drawn scaled up.
invalidate the surface when the physical changes
introduce the notion of the requested size in the Layer state
remove unused code
Merge commit 'bcbca57f4c0da0cee3682c78aacfa081483f0020' into eclair-plus-aosp
* commit 'bcbca57f4c0da0cee3682c78aacfa081483f0020':
Add a simple test of OpenGL ES 1.x.
Merge commit '15f0699504e64c1e290ef8955b1306d2a4a08201' into eclair-plus-aosp
* commit '15f0699504e64c1e290ef8955b1306d2a4a08201':
Updated status bar icons.
Merge commit '486733c1fd564acd6d1b72e38147eb5e6d3a3d71' into eclair-plus-aosp
* commit '486733c1fd564acd6d1b72e38147eb5e6d3a3d71':
Update <video> implementation after new IRC discussion with Eric Carlsson.
Merge commit '27d8514f56574011c606daedc5cabf0219b5be81' into eclair-plus-aosp
* commit '27d8514f56574011c606daedc5cabf0219b5be81':
Fix possible crash in AutoCompleteTextView.
Merge commit '86aece8b4ad6d55cc9a3c185c3730d7387a46661' into eclair-plus-aosp
* commit '86aece8b4ad6d55cc9a3c185c3730d7387a46661':
Handle bad lines in /proc/wakelocks : Fix for 2124260
Merge commit '1537a25520405f384b072c58fee935a29c4e14ea' into eclair-plus-aosp
* commit '1537a25520405f384b072c58fee935a29c4e14ea':
Remove unused api in QuickContact.java and fix the build.
Merge commit '85d86af982026145aa69a4ca280d394b9ea90372' into eclair-plus-aosp
* commit '85d86af982026145aa69a4ca280d394b9ea90372':
Fix vCard composer in three points.
Merge commit '609c2c08d7d059681434ea322b551264abab8a71' into eclair-plus-aosp
* commit '609c2c08d7d059681434ea322b551264abab8a71':
- make SyncManager get the accounts list during the constructor,
* changes:
- make SyncManager get the accounts list during the constructor, which will allow syncs to be scheduled during bootup. The providers need this so that they can potentially schedule syncs while they are starting up. - make the SyncManager message handler wait until boot has completed to start dispatching messages