Merge commit 'fb8910f958e93b7ad0fcea89fdd1dd579a962b37'
* commit 'fb8910f958e93b7ad0fcea89fdd1dd579a962b37':
Don't activate keyguard if screen is turned off while proximity sensor is active.
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 'e1ecb7dfe976080ae2b8fef26e1e68668c7ca8fb'
* commit 'e1ecb7dfe976080ae2b8fef26e1e68668c7ca8fb':
Only allow system code to call LocationManager.sendNiResponse()
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 'bb1f8a5a999e13bf6c307d575fab9f8e83a367e6'
* commit 'bb1f8a5a999e13bf6c307d575fab9f8e83a367e6':
Extend stagefright commandline up to enable vendor to reproduce specific bugs filed.
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 '3d937945a60da48a383a5a3de37583b35abf9c11'
* commit '3d937945a60da48a383a5a3de37583b35abf9c11':
Change these string constants back to match donut.
Merge commit 'b3b1ccfe0e8d9ea6582646a6cedb7f4669e41352' into eclair-plus-aosp
* commit 'b3b1ccfe0e8d9ea6582646a6cedb7f4669e41352':
Change these string constants back to match donut.
Unfortunately we are stuck with the donut ones, can't change these in Eclair
to be the more correct names.
Change-Id: Id8aaa2e90cd21631b18a36bea3755a63d0e6d577
Merge commit '580a2921083f95e9ffd905bc31f838d683f667b4' into eclair-plus-aosp
* commit '580a2921083f95e9ffd905bc31f838d683f667b4':
Add a null check in PackageParser
Merge commit 'eba188e21c752d98f03215eb15822bd39c462664'
* commit 'eba188e21c752d98f03215eb15822bd39c462664':
Various tweaks to try to improve low memory behavior.
Merge commit 'aa0a3b09e7a2947130e9a98c459a63349ef2d339' into eclair-plus-aosp
* commit 'aa0a3b09e7a2947130e9a98c459a63349ef2d339':
Various tweaks to try to improve low memory behavior.
Another way to fix this problem. Notice the failures of dataSetup and mark the requesting
apn as unenabled so future attempts can be made.
bug: 2069221
Merge commit '508990016a238b65ac657bc4c832cc732af20906'
* commit '508990016a238b65ac657bc4c832cc732af20906':
Fix issue 2045911: Camera Shutter tone does not play correctly while listening to music.
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 '569e114aa7d32c05ac64311b0bc545969c9b6893'
* commit '569e114aa7d32c05ac64311b0bc545969c9b6893':
PowerManagerService: Disallow all user activity when in proximity wake lock.
Merge commit '25b9cec8de75bd38c4868515e611cd69aff524ca' into eclair-plus-aosp
* commit '25b9cec8de75bd38c4868515e611cd69aff524ca':
PowerManagerService: Disallow all user activity when in proximity wake lock.
