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)
Merge commit 'e9772f92c719760321324e83a324619c8e080054'
* commit 'e9772f92c719760321324e83a324619c8e080054':
Add density support to layoutlib so that bitmap are scaled if needed.
Merge commit 'ad5f25656664c843828f55ca5f229cebcfd5af86'
* commit 'ad5f25656664c843828f55ca5f229cebcfd5af86':
Add a new IResourceValue that knows about the density.
Merge commit '3ca99e20c551022d4a3b3bc176e43bd733efdc21'
* commit '3ca99e20c551022d4a3b3bc176e43bd733efdc21':
Simplify the layout of all activities with a title and a progress bar.
Merge commit '450a60f8eca9308e23dcdd1c38c8ff8726b7b3c4'
* commit '450a60f8eca9308e23dcdd1c38c8ff8726b7b3c4':
Add more useful-for-debug info to 'dumpsys backup'
Merge commit '03fa3eda491a6cc9d51dd2de8706050ae5bad805'
* commit '03fa3eda491a6cc9d51dd2de8706050ae5bad805':
Fix disabled text color in choice dialogs.
Merge commit '412933234ad114c0fbb237f068b07821afb6e484'
* commit '412933234ad114c0fbb237f068b07821afb6e484':
Dont NPE if the thumbnail file cannot be opened.
Merge commit 'fde37e5b40e2f4da07829d0dfad97db0be681a70'
* commit 'fde37e5b40e2f4da07829d0dfad97db0be681a70':
rebase layout test result as the numbers reported are much more stable now
