Merge commit '4b0ad1359b96e86cbb0827a3e88aade4223587cd'
* commit '4b0ad1359b96e86cbb0827a3e88aade4223587cd':
attempt to work around [2155085, 2150246] stuck in closeTransaction()
Merge commit 'e67de07627e5a35e499eeefdfb0334b50590d053'
* commit 'e67de07627e5a35e499eeefdfb0334b50590d053':
Fix issue #2154794: Force close when start facebook application.
Merge commit '722d67dcb6bd64ac73a4c1033b3b97c1a3215efe'
* commit '722d67dcb6bd64ac73a4c1033b3b97c1a3215efe':
Only re-initialize backup state if @pm@ metadata is missing,
Merge commit '04e8a925c00ef0a1bf58932b84253ed72daf8404'
* commit '04e8a925c00ef0a1bf58932b84253ed72daf8404':
Debugging for #2027266: app drawer showing up on the side
Merge commit '3f8e158a9dd27cc4c02be4e55fd51670563217d5'
* commit '3f8e158a9dd27cc4c02be4e55fd51670563217d5':
add class description and revise descriptions for
Merge commit 'bab6680cdeddcf525bd3255f1b22b500bad4ee84'
* commit 'bab6680cdeddcf525bd3255f1b22b500bad4ee84':
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 'e092e1f531de1fc2985b83c9ec6ff40551e148f0'
* commit 'e092e1f531de1fc2985b83c9ec6ff40551e148f0':
Fix for 2155255: Revert "Cache inflated view to avoid inflation of layouts in preferences"
Merge commit '5b95f83356f130e138f3e9a26a1580c479eb955d'
* commit '5b95f83356f130e138f3e9a26a1580c479eb955d':
Update <video> implementation after new IRC discussion with Eric Carlsson.
Merge commit '2fe7c9e51a5dd29be011fa618e74ad2c79b0d42d'
* commit '2fe7c9e51a5dd29be011fa618e74ad2c79b0d42d':
Handle bad lines in /proc/wakelocks : Fix for 2124260
Merge commit '09aa95bff32f5bc965bec63cd70443c1c0ff145d'
* commit '09aa95bff32f5bc965bec63cd70443c1c0ff145d':
Remove unused api in QuickContact.java and fix the build.
Merge commit '32a702a7a8a328a7080c18fd65478caf82d86e0e'
* commit '32a702a7a8a328a7080c18fd65478caf82d86e0e':
- make SyncManager get the accounts list during the constructor,
Merge commit '8d984bc9c351e18271213c58ae7baea5cc81fda6'
* commit '8d984bc9c351e18271213c58ae7baea5cc81fda6':
Query from Bluez if name is not present in cache.
Merge commit '08e2f9d1c784b3b5c7fcd11317bde6646be25896'
* commit '08e2f9d1c784b3b5c7fcd11317bde6646be25896':
Reduce the log spew from AudioFlinger due to a certain device that can't meet latency timing. Bug 2142215.
Merge commit '0084c1cdc26338b779df2978bb8300df5424f29a'
* commit '0084c1cdc26338b779df2978bb8300df5424f29a':
if we have a single value for roundrect radius, manually clamp it before drawing.
Merge commit '2f208646ebe7579c2b8694c66d55f8c883df0ec3'
* commit '2f208646ebe7579c2b8694c66d55f8c883df0ec3':
Re-instate the link coloring on startup, but going via the browser
Merge commit 'f8c92a0f00e38271755a93ff810fee94e8353bfd'
* commit 'f8c92a0f00e38271755a93ff810fee94e8353bfd':
Reverting the background colors back to cupcake's values.
Merge commit 'f1fa1eacaa36c80c2094ba679b8384d9f4541e11'
* commit 'f1fa1eacaa36c80c2094ba679b8384d9f4541e11':
Fixed the long recorder time and reduce the number of loops.
Merge commit 'ebefded1ccbd13f190aa4c5f4e3590e5ac8f2a6d'
* commit 'ebefded1ccbd13f190aa4c5f4e3590e5ac8f2a6d':
fix account permission strings. this permission is used to protect more than just Google accounts.
Merge commit '11cc925efbe582d617ffd01894f920f9a675adc3'
* commit '11cc925efbe582d617ffd01894f920f9a675adc3':
Fix for 2133391: Allow menu hard key to be disabled in LockScreen on some devices
Merge commit '8167d8d874289c8adf5fbad1ff0790173d7616c1'
* commit '8167d8d874289c8adf5fbad1ff0790173d7616c1':
Update 4.xml with the native status change of breakText/measureText
Merge commit '844d6f9ef0aec65df51ab3f3a9960e2611783722'
* commit '844d6f9ef0aec65df51ab3f3a9960e2611783722':
Hack to fix issue #2125365: Sports Trivia compatability with Eclair (do not merge)