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.
For example, the original port settings change may just indicate a change
in the number of buffers to allocate, which won't be visible to the client
in any case.
Merge commit '007a429f09fb9e4e4fbd4205d03878874c9f7957' into eclair-mr2
* commit '007a429f09fb9e4e4fbd4205d03878874c9f7957':
Update 5.xml with last minute changes.
Merge commit '169ef4cca30c77a1a85c9684560c504a5ac230b5' into eclair-mr2-plus-aosp
* commit '169ef4cca30c77a1a85c9684560c504a5ac230b5':
Check for null before returing a chunk from the pool.
Since references can be queued in another thread, the first entry in the pool
could have been queued after processPoolLocked. Check for null and create a new
chunk if the check fails.
The fix relaxes our processing of the content-disposition header by allowing unquoted filenames, and adds the m4v type to the MIME type map incase the content-disposition header was not specified.
Change-Id: Iaab0c5b17991a2c05eff5db01babe084444fd3b7
Merge commit 'eab82c3c8c9dd88ff7267c154b415558d8e5c206' into eclair-mr2-plus-aosp
* commit 'eab82c3c8c9dd88ff7267c154b415558d8e5c206':
Add htm and html extensions to the map as "text/html"
Merge commit 'dbdc5e15a3d338048dd5b98af463b1857536e4c6' into eclair-mr2-plus-aosp
* commit 'dbdc5e15a3d338048dd5b98af463b1857536e4c6':
docs: fix doc error in dialog example snippet (no not merge)
Merge commit '445c05c4849c960bb43f73a0390e62dc73991da6' into eclair-mr2
* 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 'bfea1e139683cdb339e0cb6aa5970b5334369d77' into eclair-mr2-plus-aosp
* commit 'bfea1e139683cdb339e0cb6aa5970b5334369d77':
A few more testcases for the vendor to reproduce issues with their decoder. Not part of the shipping image.
Merge commit '720ac1d4fa0ca3dc44c5c8dc4f57949b2f72681f' into eclair-mr2-plus-aosp
* commit '720ac1d4fa0ca3dc44c5c8dc4f57949b2f72681f':
1) Add 10 seconds wait time before collecting the end memory.
Merge commit '12751251cfdccb307117ae87543db6959f7807c7' into eclair-mr2-plus-aosp
* commit '12751251cfdccb307117ae87543db6959f7807c7':
Fix bug exposed by filmstrip. The updated and expanded SimpleMesh had an ordering bug with component coordinates when both texture and normals were used.
