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 '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 '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 '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 '9882f38584882461dbfef229e4fe316dacebd9c5' into eclair-mr2-plus-aosp
* commit '9882f38584882461dbfef229e4fe316dacebd9c5':
Do not apply light sensor debounce logic while the light sensor is still warming up.
Merge commit '977e8d28e5e4f8dbb8997b2206a943e17f8be5bb'
* commit '977e8d28e5e4f8dbb8997b2206a943e17f8be5bb':
Add postdata identifier so that if we cache the post
Merge commit 'c53cc103908fbd73bebf45f1dab36dc808439c2e'
* commit 'c53cc103908fbd73bebf45f1dab36dc808439c2e':
Support vCard format emitted by Windows Mobile 6.5, which contains invalid "VALUE" params and
Merge commit '75face7d2dad974781a5aaf48e0d20ebe6e0ca35'
* commit '75face7d2dad974781a5aaf48e0d20ebe6e0ca35':
Make vCard parser invalid lines in vCard file which look like some comment.
Merge commit 'ac94fbd081450ae7f208e4525b23b36d90d382e0'
* commit 'ac94fbd081450ae7f208e4525b23b36d90d382e0':
Capture failure of copybit->stretch()
Fix obvious typo bug in egl.cpp
LocationManagerService: Fix race when removing LocationListener
Don't return when blocking is true.
Fix of compatibility with multifunction extUSB adapters.
Fix documentation example, per issue 895 on android.googlecode.com
Merge commit '96fce6e112aec1e09c82cfd7657381ce112dc555' into eclair-mr2
* commit '96fce6e112aec1e09c82cfd7657381ce112dc555':
Do not apply light sensor debounce logic while the light sensor is still warming up.
Merge commit 'e81c9609cc99d10045b70f79729b4b0edbf793c2' into eclair-mr2-plus-aosp
* commit 'e81c9609cc99d10045b70f79729b4b0edbf793c2':
Add postdata identifier so that if we cache the post
Merge commit '0e983864fca215513de9664573dcc3bbadf41e79' into eclair-mr2-plus-aosp
* commit '0e983864fca215513de9664573dcc3bbadf41e79':
Support vCard format emitted by Windows Mobile 6.5, which contains invalid "VALUE" params and
Merge commit 'df0ce74126e75963a33201b6c98ce46837a2e55e' into eclair-mr2-plus-aosp
* commit 'df0ce74126e75963a33201b6c98ce46837a2e55e':
Make vCard parser invalid lines in vCard file which look like some comment.
Provide the functions to be called from native code that take
the plugin's location and desired class name and then load that
class from the plugin's apk if it is available.
see http://b/2215696