Merge commit '32de91306233b08604ce7a158a37235c7042ae13' into eclair-mr2-plus-aosp
* commit '32de91306233b08604ce7a158a37235c7042ae13':
Fix high density bug 2179543: use 'dip' instead of 'px'
Merge commit 'cdc8b326dd0989003e2fdd7d5a605b5755acf221' into eclair-mr2
* commit 'cdc8b326dd0989003e2fdd7d5a605b5755acf221':
Fix high density bug 2179543: use 'dip' instead of 'px'
Merge commit '12a19551dd106b04898d262807213ce4c6d1e5f7' into eclair-mr2-plus-aosp
* commit '12a19551dd106b04898d262807213ce4c6d1e5f7':
If openOrCreateDatabase() throws an exception, delete
* changes:
If openOrCreateDatabase() throws an exception, delete the old db and re-do it. If it still fails, something bad happens, like the directory may have the different permission. Let it throw as WebView needs the db.
Merge commit 'aa033b79714f458b47d7c3fbc45e9fe51194f533' into eclair-mr2-plus-aosp
* commit 'aa033b79714f458b47d7c3fbc45e9fe51194f533':
Power Manager support for light sensor backlight management.
Merge commit '6ef38fb4262356c15cad8a1957ce58d2bb5b3de6' into eclair-mr2-plus-aosp
* commit '6ef38fb4262356c15cad8a1957ce58d2bb5b3de6':
Log exception if we hit an error parsing an incoming SMS message.
Merge commit 'd7786b41b78ba8592daea708b024b5a75e441992' into eclair-mr2
* commit 'd7786b41b78ba8592daea708b024b5a75e441992':
Power Manager support for light sensor backlight management.
Merge commit 'cea8f8e4a8506678c0255763f46d1f6577f991a1' into eclair-mr2
* commit 'cea8f8e4a8506678c0255763f46d1f6577f991a1':
Log exception if we hit an error parsing an incoming SMS message.
Fix problem with ignored sensor events right after screen turns on.
Do not flash button backlights when device is booting.
Process the first light sensor change after waking the screen immediately rather than debouncing.
Cancel mAutoBrightnessTask when light sensor is disabled.
Change-Id: Iffc5e090b239432b7643812fa8ecb5f69da1679d
Signed-off-by: Mike Lockwood <lockwood@android.com>
Merge commit '992f4802aefba9f4a8122cc5332f2bc726a3f3f6' into eclair-mr2-plus-aosp
* commit '992f4802aefba9f4a8122cc5332f2bc726a3f3f6':
Use the TLS register if HAVE_ARM_TLS_REGISTER is defined
Merge commit 'b34d5d527596102ae7a040d787e4d8c336bf192b' into eclair-mr2
* commit 'b34d5d527596102ae7a040d787e4d8c336bf192b':
Use the TLS register if HAVE_ARM_TLS_REGISTER is defined
Merge commit 'b0f4d0cd249773927c891ab52505505b6b19347b' into eclair-mr2-plus-aosp
* commit 'b0f4d0cd249773927c891ab52505505b6b19347b':
Proper fix for zero signal strength and no_service. Fixes#2176141
Merge commit 'f37447bad3773b62176baa837908daf6edb44273' into eclair-mr2
* commit 'f37447bad3773b62176baa837908daf6edb44273':
Proper fix for zero signal strength and no_service. Fixes#2176141
Merge commit '39f4408f994a37fd805c964c673ec7ad1702a817' into eclair-mr2-plus-aosp
* commit '39f4408f994a37fd805c964c673ec7ad1702a817':
Update 5.xml with last minute changes.
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-mr2
* 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 'cf4ff74017ec6b29646022ae5cbf667483b6137b' into eclair-mr2-plus-aosp
* commit 'cf4ff74017ec6b29646022ae5cbf667483b6137b':
one step towards fixing [2071412] work around mdp 32-bits fade limitation
Merge commit '639d69fe8799ac2fa0bbf7560229531377ccc0f4' into eclair-mr2
* commit '639d69fe8799ac2fa0bbf7560229531377ccc0f4':
one step towards fixing [2071412] work around mdp 32-bits fade limitation
Merge commit 'dad4780bbd6be0891ea8745bd274fc8d6882f071' into eclair-mr2-plus-aosp
* commit 'dad4780bbd6be0891ea8745bd274fc8d6882f071':
support for multiline paragraph style indentation
Merge commit 'f9feb96e4ff4e390112410f0b4a514a0fca951d8' into eclair-mr2-plus-aosp
* commit 'f9feb96e4ff4e390112410f0b4a514a0fca951d8':
Add access to ContentProvider for SyncState.
Merge commit '788a7ee1e9277dcce016fd084c81614222f7374a' into eclair-mr2-plus-aosp
* commit '788a7ee1e9277dcce016fd084c81614222f7374a':
Add a string for upload file button.
Merge commit '8cca3a6e48047201862e0d8c3b8d99e5d90266ba' into eclair-mr2-plus-aosp
* commit '8cca3a6e48047201862e0d8c3b8d99e5d90266ba':
Avoid signaling a format change to the client if its insubstantial.
Merge commit 'bf10842617ec2893d8b1ac6070164f4ad2c6d4bf' into eclair-mr2-plus-aosp
* commit 'bf10842617ec2893d8b1ac6070164f4ad2c6d4bf':
Update 5.xml with last minute changes.
