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
Merge commit '79fc65605d95dfb26ad6c9bf7024fc429b3e6ff8'
* commit '79fc65605d95dfb26ad6c9bf7024fc429b3e6ff8':
Telephony: Add a failure cause for CDMA call failures and rename
Merge commit '10abe7f3e70fd9a54e20ec06ae0830a2a46bee50'
* commit '10abe7f3e70fd9a54e20ec06ae0830a2a46bee50':
Fix for 2137900: Be more conservative about poking the wakelock.
Merge commit 'ed7f883187f8f6c6dfd240412523a911f616b688'
* commit 'ed7f883187f8f6c6dfd240412523a911f616b688':
Add Gservices flag for Vending doctor download complete timeout.
Merge commit 'fa62a0478e40c1730c04a417cf9ec4fa5d1991e5'
* commit 'fa62a0478e40c1730c04a417cf9ec4fa5d1991e5':
Fix the reporting of ActiveApnTypes on CDMA
Merge commit 'dfab8b687039ef764249c22c00d0b030c55067da'
* commit 'dfab8b687039ef764249c22c00d0b030c55067da':
check for null item in web history in saveState
Merge commit '11bb09c3829c6dc6874ed833bf9adcb1bc3195e3'
* commit '11bb09c3829c6dc6874ed833bf9adcb1bc3195e3':
EventLog when a database file is deleted due to corruption.
Merge commit 'a4f2ac7e0e2cc4cfcf19c7ac536fe0dd0306354c'
* commit 'a4f2ac7e0e2cc4cfcf19c7ac536fe0dd0306354c':
Allow scrolls to continue when getting a new content size.
Merge commit 'aed865207f7425f6c4d0538decb04109c415410d'
* commit 'aed865207f7425f6c4d0538decb04109c415410d':
Clean up cacheColorHint to be better controlled by the theme.
