* changes:
Correction of an error in the setRotate method of the ColorMatrix class. The matrix rotation params around the 2nd axis was not set correctly:
Merge commit '13ce56bdbc4872c0b12caff501e063f5a75073db' into eclair-plus-aosp
* commit '13ce56bdbc4872c0b12caff501e063f5a75073db':
docs: add more documentation for the bluetooth apis.
Merge commit '88427cff609e668185010af2244500be5823595e' into eclair
* commit '88427cff609e668185010af2244500be5823595e':
docs: add more documentation for the bluetooth apis.
Merge commit '50c548d242d637328ec6b2c4987969b02695cc7d' into eclair-plus-aosp
* commit '50c548d242d637328ec6b2c4987969b02695cc7d':
Disabling user activity now resets user power state so the keyguard can set short screen timeout when keyguard is unhidden.
Merge commit 'ee2b094de0c5d7ffa64d51e7bd4ec3238be97113' into eclair-plus-aosp
* commit 'ee2b094de0c5d7ffa64d51e7bd4ec3238be97113':
Do not deactivate the proximity sensor until after the sensor returns negative.
Merge commit 'de342a01a0272540c8468fcfcf0f0067c0d743e0' into eclair-plus-aosp
* commit 'de342a01a0272540c8468fcfcf0f0067c0d743e0':
PowerManagerService: enable logging for when mPowerState changes.
Merge commit '11cff8cd30f03b5adb137e985532543da5e960c4' into eclair-plus-aosp
* commit '11cff8cd30f03b5adb137e985532543da5e960c4':
Add a way for wallpapers to know the delta between virtual screens.
Merge commit 'e6ab011b8b8aa6c461e64cabb9b25d890d68edb1' into eclair-plus-aosp
* commit 'e6ab011b8b8aa6c461e64cabb9b25d890d68edb1':
Support for fallback fonts in layoutlib.
Merge commit '3ea2ae7d6f8a73947831c15f970de70730c5a0f6' into eclair-plus-aosp
* commit '3ea2ae7d6f8a73947831c15f970de70730c5a0f6':
Add new notifications and ringtones.
Merge commit 'fe225e25bda5d48eaa67d1fd3fb877de6c40e837' into eclair-plus-aosp
* commit 'fe225e25bda5d48eaa67d1fd3fb877de6c40e837':
Fix the selection of locale from SIM mcc.
Merge commit '090c60bb9d6608df4a8d753fc91974fe2c49c262' into eclair-plus-aosp
* commit '090c60bb9d6608df4a8d753fc91974fe2c49c262':
AudioFlinger: delete Track object when createTrack() fails due to lack of tracks in AudioMixer.
Merge commit '2bb53754337225508f2b4d12f1575df7c226100c' into eclair-plus-aosp
* commit '2bb53754337225508f2b4d12f1575df7c226100c':
Fix code example in Parcelable javadoc
Merge commit '93572eef41f94f023037482f194db0ab07d0c33a' into eclair-plus-aosp
* commit '93572eef41f94f023037482f194db0ab07d0c33a':
More log for issue 2242381.
Merge commit 'ba8eb1efefdc98c016b64e10c26f9729697f254f' into eclair-plus-aosp
* commit 'ba8eb1efefdc98c016b64e10c26f9729697f254f':
Use SystemClock.elapsedRealtime() instead of sensor timestamp
Merge commit '17479ebe90a5ebd17ee386b8fd83256765afce0b' into eclair-plus-aosp
* commit '17479ebe90a5ebd17ee386b8fd83256765afce0b':
Ignore the light sensor if the screen is turning off.
Merge commit '3f857b78fc68e5d700139bdc6078c5333b62a9bc' into eclair-plus-aosp
* commit '3f857b78fc68e5d700139bdc6078c5333b62a9bc':
Allow a GLThread to release and reacquire the EGL Surface as needed.
Merge commit '96fce6e112aec1e09c82cfd7657381ce112dc555' into eclair-plus-aosp
* commit '96fce6e112aec1e09c82cfd7657381ce112dc555':
Do not apply light sensor debounce logic while the light sensor is still warming up.
To prevent buggy command implementations from poisoning binder threads'
scheduling class & priority for future command execution, we now reset the
cgroup and thread priority to foreground/normal when a binder service thread
finishes executing the designated command.
Change-Id: Ibc0ab2485751453f6dc96fdb4eb877fd02796e3f
Merge commit '0691ad50ca6b7a2968a0b95e1e9bb7228dd47d65' into eclair-plus-aosp
* commit '0691ad50ca6b7a2968a0b95e1e9bb7228dd47d65':
Remove "@hide pending API council" in webkit to expose
Merge commit '638d86535264b24b54698fca7e18e68571fe0bad' into eclair-plus-aosp
* commit '638d86535264b24b54698fca7e18e68571fe0bad':
Expose WallpaperSettingsActivity in the public API.
