Merge commit '7a51b14d9f7f8c48c74ed1787bed3ef83aae6658'
* commit '7a51b14d9f7f8c48c74ed1787bed3ef83aae6658':
Check if rename of backed up file fails before persisting new changes.
Merge commit '9d2dc89cc32cfc768df390278fe18b72b868a718'
* commit '9d2dc89cc32cfc768df390278fe18b72b868a718':
Set BondState to Bonding only if it not Bonded already.
Merge commit 'e67de07627e5a35e499eeefdfb0334b50590d053'
* commit 'e67de07627e5a35e499eeefdfb0334b50590d053':
Fix issue #2154794: Force close when start facebook application.
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 '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 '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 '2f208646ebe7579c2b8694c66d55f8c883df0ec3'
* commit '2f208646ebe7579c2b8694c66d55f8c883df0ec3':
Re-instate the link coloring on startup, but going via the browser
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 '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 '094e3e0bcc81a795f35ac2ea218d0fc0109100cf' into eclair-plus-aosp
* commit '094e3e0bcc81a795f35ac2ea218d0fc0109100cf':
Check if rename of backed up file fails before persisting new changes.
* changes:
Check if rename of backed up file fails before persisting new changes. If not these system services will end up with inconsistent settings files when the device runs out of storage. Delete mangled settings file in PackageManager if the current write fails so that we don't end up overwriting the backed up version with the mangled version Include null check when retrieving fwd locked resource for an existing package
If not these system services will end up with inconsistent settings files
when the device runs out of storage.
Delete mangled settings file in PackageManager if the current write fails
so that we don't end up overwriting the backed up version with the
mangled version
Include null check when retrieving fwd locked resource for an existing package
