Merge commit 'c298a8518a8fd73a303132c7db241f10eb46c5b6' into eclair-plus-aosp
* commit 'c298a8518a8fd73a303132c7db241f10eb46c5b6':
add an accessor for Context for use by subclasses
* Other changes
+ Re-assign err codes in VpnManager.
+ Add new err codes: REMOTE_PPP_HUNG_UP, PPP_NEGOTIATION_FAILED.
+ Delete the state file only if it exists (to prevent logging an
unable-to-unlink error).
+ Extend timeout to 40 seconds.
Merge commit '1005569fbb459007ff9d9fddbfa6e49947166166' into eclair-plus-aosp
* commit '1005569fbb459007ff9d9fddbfa6e49947166166':
Fix issue #2084148: Define the format for the auto focus preview for barcode scanning
Merge commit 'bf8ecd7c7ecfb3579a91b43d95e7fa0d8a0d63be' into eclair-plus-aosp
* commit 'bf8ecd7c7ecfb3579a91b43d95e7fa0d8a0d63be':
Apparently setting the preferred role of the OMX component is now required on this platform.
Merge commit 'bfa1d083aac92a8fc315e18a381287108b138baf' into eclair-plus-aosp
* commit 'bfa1d083aac92a8fc315e18a381287108b138baf':
Fix strings whose apostrophes were eaten because of the lack of a backslash.
Merge commit 'c1dccce74104c5ababb1118fda3ea43974adbad4' into eclair-plus-aosp
* commit 'c1dccce74104c5ababb1118fda3ea43974adbad4':
Squashed commit of the following:
Merge commit 'd6ac7c73e17f0ce0cc3b1290760c4f67cafcdec5' into eclair-plus-aosp
* commit 'd6ac7c73e17f0ce0cc3b1290760c4f67cafcdec5':
Fix issue #2069662: The wallpaper doesn't move along with the home screen
Merge commit 'fa5260290f3c19988c292f21845a948374c3c31d' into eclair-plus-aosp
* commit 'fa5260290f3c19988c292f21845a948374c3c31d':
Final Donut API list.
Merge commit '6391830d103ccb19465c69660065c22c2711dcfd' into eclair-plus-aosp
* commit '6391830d103ccb19465c69660065c22c2711dcfd':
Don't activate keyguard if screen is turned off while proximity sensor is active.
Merge commit '18ad9f657bda79069233c0b8e1476888ffd894d4' into eclair-plus-aosp
* commit '18ad9f657bda79069233c0b8e1476888ffd894d4':
Only allow system code to call LocationManager.sendNiResponse()
Merge commit '0409cde3601131caf14c88d132c65d74774bbd79' into eclair-plus-aosp
* commit '0409cde3601131caf14c88d132c65d74774bbd79':
Updating synchronized to match x-net changes
Merge commit '1e0f7627389a18d7a2ea74d7a5fb2c251de56a56' into eclair-plus-aosp
* commit '1e0f7627389a18d7a2ea74d7a5fb2c251de56a56':
Make SINGLE_TOP work with CLEAR_TOP.
Merge commit 'e18d4d01152071f3a489a0d3077ad89dfa1f3851' into eclair-plus-aosp
* commit 'e18d4d01152071f3a489a0d3077ad89dfa1f3851':
Extend stagefright commandline up to enable vendor to reproduce specific bugs filed.
Merge commit 'b3b1ccfe0e8d9ea6582646a6cedb7f4669e41352' into eclair-plus-aosp
* commit 'b3b1ccfe0e8d9ea6582646a6cedb7f4669e41352':
Change these string constants back to match donut.
Merge commit '580a2921083f95e9ffd905bc31f838d683f667b4' into eclair-plus-aosp
* commit '580a2921083f95e9ffd905bc31f838d683f667b4':
Add a null check in PackageParser
Merge commit 'aa0a3b09e7a2947130e9a98c459a63349ef2d339' into eclair-plus-aosp
* commit 'aa0a3b09e7a2947130e9a98c459a63349ef2d339':
Various tweaks to try to improve low memory behavior.
Merge commit 'bc86bda499b8600cc3dc900bba0e6421304c26dd' into eclair-plus-aosp
* commit 'bc86bda499b8600cc3dc900bba0e6421304c26dd':
Fix issue 2045911: Camera Shutter tone does not play correctly while listening to music.
Merge commit '25b9cec8de75bd38c4868515e611cd69aff524ca' into eclair-plus-aosp
* commit '25b9cec8de75bd38c4868515e611cd69aff524ca':
PowerManagerService: Disallow all user activity when in proximity wake lock.
