Merge commit '9e0da5bd2d40b33d7de8897aa5e95a06d42fd990'
* commit '9e0da5bd2d40b33d7de8897aa5e95a06d42fd990':
Make vCard exporter check invalid phone numbers and re-format them if needed.
Merge commit '452a52968f43c21e9a040009e209df023a34876c' into eclair-mr2-plus-aosp
* commit '452a52968f43c21e9a040009e209df023a34876c':
Make vCard exporter check invalid phone numbers and re-format them if needed.
Merge commit 'c6aaa09b7075f00e2cff543b50bc84bbdd133d7b'
* commit 'c6aaa09b7075f00e2cff543b50bc84bbdd133d7b':
AudioFlinger: delete Track object when createTrack() fails due to lack of tracks in AudioMixer.
Merge commit 'e59631b601dda685cd0ad244ec502ff3bf308dc0'
* commit 'e59631b601dda685cd0ad244ec502ff3bf308dc0':
Ignore the light sensor if the screen is turning off.
Merge commit '61a2c04ffedfcd963b1b8bcb310ab12b0d7e9dd4' into eclair-mr2-plus-aosp
* commit '61a2c04ffedfcd963b1b8bcb310ab12b0d7e9dd4':
Add new notifications and ringtones.
Merge commit 'feafc202bbfd768423326aeb0faafaee3f348bb6' into eclair-mr2-plus-aosp
* commit 'feafc202bbfd768423326aeb0faafaee3f348bb6':
Fix the selection of locale from SIM mcc.
Merge commit '756e75cfcfbd5b311167de9661a1e3376dd4c4db' into eclair-mr2-plus-aosp
* commit '756e75cfcfbd5b311167de9661a1e3376dd4c4db':
AudioFlinger: delete Track object when createTrack() fails due to lack of tracks in AudioMixer.
Merge commit 'e8341ebbc672fb196e31cadbf5cf43770cec0525' into eclair-mr2-plus-aosp
* commit 'e8341ebbc672fb196e31cadbf5cf43770cec0525':
Fix code example in Parcelable javadoc
Merge commit '05388e454b9d5c6e3af0ca4b6d6e62f2352f6b19' into eclair-mr2-plus-aosp
* commit '05388e454b9d5c6e3af0ca4b6d6e62f2352f6b19':
More log for issue 2242381.
Merge commit '6bfd8d2a31037716f2e0964625807fc7b8e90e92' into eclair-mr2-plus-aosp
* commit '6bfd8d2a31037716f2e0964625807fc7b8e90e92':
Use SystemClock.elapsedRealtime() instead of sensor timestamp
Merge commit '149f6710f774f36570de7be8ffa3dd6e8194a11d' into eclair-mr2-plus-aosp
* commit '149f6710f774f36570de7be8ffa3dd6e8194a11d':
Ignore the light sensor if the screen is turning off.
Merge commit '3ea2ae7d6f8a73947831c15f970de70730c5a0f6' into eclair-mr2
* commit '3ea2ae7d6f8a73947831c15f970de70730c5a0f6':
Add new notifications and ringtones.
Merge commit 'fe225e25bda5d48eaa67d1fd3fb877de6c40e837' into eclair-mr2
* commit 'fe225e25bda5d48eaa67d1fd3fb877de6c40e837':
Fix the selection of locale from SIM mcc.
Merge commit '090c60bb9d6608df4a8d753fc91974fe2c49c262' into eclair-mr2
* commit '090c60bb9d6608df4a8d753fc91974fe2c49c262':
AudioFlinger: delete Track object when createTrack() fails due to lack of tracks in AudioMixer.
Merge commit '2bb53754337225508f2b4d12f1575df7c226100c' into eclair-mr2
* commit '2bb53754337225508f2b4d12f1575df7c226100c':
Fix code example in Parcelable javadoc
Merge commit '93572eef41f94f023037482f194db0ab07d0c33a' into eclair-mr2
* commit '93572eef41f94f023037482f194db0ab07d0c33a':
More log for issue 2242381.
Merge commit 'ba8eb1efefdc98c016b64e10c26f9729697f254f' into eclair-mr2
* commit 'ba8eb1efefdc98c016b64e10c26f9729697f254f':
Use SystemClock.elapsedRealtime() instead of sensor timestamp
Merge commit '73ae27f0c56fa705dcfb86d784a95b86f10e48ad'
* commit '73ae27f0c56fa705dcfb86d784a95b86f10e48ad':
Allow a GLThread to release and reacquire the EGL Surface as needed.
Merge commit '17479ebe90a5ebd17ee386b8fd83256765afce0b' into eclair-mr2
* commit '17479ebe90a5ebd17ee386b8fd83256765afce0b':
Ignore the light sensor if the screen is turning off.
Merge commit '8da3ac92a6a6247ef06de4d4b684f8635d8fc003' into eclair-mr2-plus-aosp
* commit '8da3ac92a6a6247ef06de4d4b684f8635d8fc003':
Allow a GLThread to release and reacquire the EGL Surface as needed.
Merge commit '6720bb8314600a2b55a18159b4a22dc4b18aec88'
* commit '6720bb8314600a2b55a18159b4a22dc4b18aec88':
new gservices flag for delaying bad gmail operations
Merge commit '29c00b0f09777c0ef94b53a0a7333d8416fb7abf'
* commit '29c00b0f09777c0ef94b53a0a7333d8416fb7abf':
Allow plugins to load java classes from their apk.
Merge commit '65fac51faf8ffe759a634497b1654a3b47406107'
* commit '65fac51faf8ffe759a634497b1654a3b47406107':
Do not apply light sensor debounce logic while the light sensor is still warming up.
Merge commit 'da14742dfc0d3ed127033255d7e79fa187225420'
* commit 'da14742dfc0d3ed127033255d7e79fa187225420':
Do not apply keyguard's short timeout when the keyguard is hidden by another window.
Merge commit '3ea2ae7d6f8a73947831c15f970de70730c5a0f6' into eclair-plus-aosp
* commit '3ea2ae7d6f8a73947831c15f970de70730c5a0f6':
Add new notifications and ringtones.
Merge commit '26c91fa694464c79de39988f9f42cee375ff0a14' into eclair-mr2-plus-aosp
* commit '26c91fa694464c79de39988f9f42cee375ff0a14':
new gservices flag for delaying bad gmail operations
Merge commit '521123e0ed91348be81d3d754d3ee13ecf454ced' into eclair-mr2-plus-aosp
* commit '521123e0ed91348be81d3d754d3ee13ecf454ced':
Allow plugins to load java classes from their apk.
Merge commit 'fe225e25bda5d48eaa67d1fd3fb877de6c40e837' into eclair-plus-aosp
* commit 'fe225e25bda5d48eaa67d1fd3fb877de6c40e837':
Fix the selection of locale from SIM mcc.