Merge commit 'f8c92a0f00e38271755a93ff810fee94e8353bfd'
* commit 'f8c92a0f00e38271755a93ff810fee94e8353bfd':
Reverting the background colors back to cupcake's values.
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 '3ca99e20c551022d4a3b3bc176e43bd733efdc21'
* commit '3ca99e20c551022d4a3b3bc176e43bd733efdc21':
Simplify the layout of all activities with a title and a progress bar.
Merge commit '03fa3eda491a6cc9d51dd2de8706050ae5bad805'
* commit '03fa3eda491a6cc9d51dd2de8706050ae5bad805':
Fix disabled text color in choice dialogs.
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 '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.
Merge commit 'ce37120df3099a1bb544ff1ef1a016a20794dd51'
* commit 'ce37120df3099a1bb544ff1ef1a016a20794dd51':
Fix bug where we would return null with disabled components.
Merge commit '4df43ab1d834f839f3b1e535554836a936902d00'
* commit '4df43ab1d834f839f3b1e535554836a936902d00':
Fix issue #1930911: Crash in system process
Merge commit 'e6566064a990fcfc21334df33eb9c771f22eb0d5'
* commit 'e6566064a990fcfc21334df33eb9c771f22eb0d5':
Finish off java API to allow fading scrollbars
Merge commit 'fd974f208c5f1e7e6682d772d2cebf4501cd5aed' into eclair-plus-aosp
* commit 'fd974f208c5f1e7e6682d772d2cebf4501cd5aed':
Reverting the background colors back to cupcake's values.
Merge commit '2a35c8d7017e4a9408a3c3b8ef1145df082d6782' into eclair-plus-aosp
* commit '2a35c8d7017e4a9408a3c3b8ef1145df082d6782':
fix account permission strings. this permission is used to protect more than just Google accounts.
Merge commit '2e4dbe70e7c0fe003dab0837fd1dba2703bdd6e2' into eclair-plus-aosp
* commit '2e4dbe70e7c0fe003dab0837fd1dba2703bdd6e2':
Unhide APIs for enabling geolocation in web views. I've confirmed
Merge commit 'a4c96aa2fadb0c8642a2c8da5f8368cc3de06ed0' into eclair-plus-aosp
* commit 'a4c96aa2fadb0c8642a2c8da5f8368cc3de06ed0':
Fix for 2133391: Allow menu hard key to be disabled in LockScreen on some devices
Merge commit '91c6bdd20365a5c6d33986cb941aa085864d016e' into eclair-plus-aosp
* commit '91c6bdd20365a5c6d33986cb941aa085864d016e':
Simplify the layout of all activities with a title and a progress bar.
Merge commit '92f0370cf09ef835c72099864fe7c0e7b7389877' into eclair-plus-aosp
* commit '92f0370cf09ef835c72099864fe7c0e7b7389877':
Fix disabled text color in choice dialogs.
