Merge commit 'd7786b41b78ba8592daea708b024b5a75e441992' into eclair-plus-aosp
* commit 'd7786b41b78ba8592daea708b024b5a75e441992':
Power Manager support for light sensor backlight management.
Merge commit 'cea8f8e4a8506678c0255763f46d1f6577f991a1' into eclair-plus-aosp
* commit 'cea8f8e4a8506678c0255763f46d1f6577f991a1':
Log exception if we hit an error parsing an incoming SMS message.
Merge commit 'b34d5d527596102ae7a040d787e4d8c336bf192b' into eclair-plus-aosp
* commit 'b34d5d527596102ae7a040d787e4d8c336bf192b':
Use the TLS register if HAVE_ARM_TLS_REGISTER is defined
Merge commit 'f37447bad3773b62176baa837908daf6edb44273' into eclair-plus-aosp
* commit 'f37447bad3773b62176baa837908daf6edb44273':
Proper fix for zero signal strength and no_service. Fixes#2176141
Track phone service state changes and use a separate timer for out-of-service
since the hunting can timeout on some devices.
Store the timeout value in the config.xml, as it is device/network specific.
Settings App will also change to use the hunting duration to compute the cost
of zero signal.
Merge commit 'b5d69242d10021f82632d62c30b1ce63785c9386' into eclair-plus-aosp
* commit 'b5d69242d10021f82632d62c30b1ce63785c9386':
Update 5.xml with last minute changes.
Merge commit 'ae26b8b6f40ad037927bf02ffd47953001c2cb3b' into eclair
* commit 'ae26b8b6f40ad037927bf02ffd47953001c2cb3b':
Update 5.xml with last minute changes.
Merge commit '639d69fe8799ac2fa0bbf7560229531377ccc0f4' into eclair-plus-aosp
* commit '639d69fe8799ac2fa0bbf7560229531377ccc0f4':
one step towards fixing [2071412] work around mdp 32-bits fade limitation
Merge commit '007a429f09fb9e4e4fbd4205d03878874c9f7957' into eclair-plus-aosp
* commit '007a429f09fb9e4e4fbd4205d03878874c9f7957':
Update 5.xml with last minute changes.
Merge commit '445c05c4849c960bb43f73a0390e62dc73991da6' into eclair-plus-aosp
* commit '445c05c4849c960bb43f73a0390e62dc73991da6':
docs: fix doc error in dialog example snippet (no not merge)
Merge commit 'f3bc5349b20f642f798c2b96d7bf7c05c2af998f' into eclair
* commit 'f3bc5349b20f642f798c2b96d7bf7c05c2af998f':
docs: fix doc error in dialog example snippet (no not merge)
Merge commit 'f585be7f373ad7920a7c486f84cc38b86e3572b7' into eclair-plus-aosp
* commit 'f585be7f373ad7920a7c486f84cc38b86e3572b7':
A few more testcases for the vendor to reproduce issues with their decoder. Not part of the shipping image.
Merge commit 'da2ecbebd226a0fbc5ed881c541b9126d30f9007' into eclair-plus-aosp
* commit 'da2ecbebd226a0fbc5ed881c541b9126d30f9007':
1) Add 10 seconds wait time before collecting the end memory.
Merge commit 'd8f7a0e3de32a5f1378e1a13f6a9f94d62a620ac' into eclair-plus-aosp
* commit 'd8f7a0e3de32a5f1378e1a13f6a9f94d62a620ac':
Fix bug exposed by filmstrip. The updated and expanded SimpleMesh had an ordering bug with component coordinates when both texture and normals were used.
* changes:
Fix bug exposed by filmstrip. The updated and expanded SimpleMesh had an ordering bug with component coordinates when both texture and normals were used.
Merge commit '69fba87ac16d1c10da81fc3213ae169c755797f4' into eclair-plus-aosp
* commit '69fba87ac16d1c10da81fc3213ae169c755797f4':
fix [2187212] add support for GLESv2 dispatch based on TLS
* changes:
do not merge Return valid package info for packages that have been uninstalled with an option to retain data and resources using the flag GET_UNINSTALLED_PACKAGES These packages do not have a package setting. just check the flag and return the required info from PackageParser.generatePackageInfo
Merge commit '0b08abe1b8e4f49cfaefb8226696664ad3d5ca6a' into eclair-plus-aosp
* commit '0b08abe1b8e4f49cfaefb8226696664ad3d5ca6a':
Register for light sensor events if non-hardware based auto-brightnees is enabled
We will use the System.SCREEN_BRIGHTNESS_MODE Settings value instead.
Add SCREEN_BRIGHTNESS_MODE_MANUAL and SCREEN_BRIGHTNESS_MODE_AUTOMATIC constants.
Change-Id: I01935be3fcb48cf76392d2c594205cb47babc5b2
Signed-off-by: Mike Lockwood <lockwood@android.com>
Merge commit '39e6773431e6010c5066c0e13facfd943c932c7e' into eclair-plus-aosp
* commit '39e6773431e6010c5066c0e13facfd943c932c7e':
do not merge: fix copy/paste using trackball on passion
