Merge commit 'ffae4fcc78d0f280da6052d102b11962fb8041b7' into eclair-plus-aosp
* commit 'ffae4fcc78d0f280da6052d102b11962fb8041b7':
attempt to fix [2099362] Possible SurfaceFlinger crash
Merge commit '542051f19f614c06c4637e3a32ca45e6e2a4add4'
* commit '542051f19f614c06c4637e3a32ca45e6e2a4add4':
Fixing a concurrency problem by changing the contact aggregation exception API.
Merge commit '9cc1817d46d8092865d8f1e7a6391dcae197a26a' into eclair-plus-aosp
* commit '9cc1817d46d8092865d8f1e7a6391dcae197a26a':
Fixing a concurrency problem by changing the contact aggregation exception API.
Merge commit '70712f19b49278e07ee76d6f5d0667dec6a635f8'
* commit '70712f19b49278e07ee76d6f5d0667dec6a635f8':
Minor perf improvement to fall and expand use of struct.
Merge commit 'ac67ebe667d30f3cd2e39fa57164d4f3ddaea677' into eclair-plus-aosp
* commit 'ac67ebe667d30f3cd2e39fa57164d4f3ddaea677':
Minor perf improvement to fall and expand use of struct.
Merge commit '64a663e3e13cd5d6ee99610608dd1d0b5f4a62ab'
* commit '64a663e3e13cd5d6ee99610608dd1d0b5f4a62ab':
Fix mncLength in cases with a malformed AD_DONE msg from SIM
Merge commit 'c2042f5e4910c4f7c5b812787ad2b025d93da497' into eclair-plus-aosp
* commit 'c2042f5e4910c4f7c5b812787ad2b025d93da497':
Fix mncLength in cases with a malformed AD_DONE msg from SIM
The current API requires a contact_id and a raw_contact_id
There are at least two issues with this approach I did not recognize initially:
1. Contact_id may be changed asynchronously by aggregation or some other process.
2. A raw contacts may need to be added to an aggregate before the actual aggregation pass
has gotten to it, so the client would need to wait for the aggregation to complete
before it can set an aggregation exception. That's backwards.
Merge commit 'bdbe87d0756a54dbc2edd24b75b9cd98cab31442'
* commit 'bdbe87d0756a54dbc2edd24b75b9cd98cab31442':
Wallpapers: new transitions, hiding when not visible, other cleanup.
Merge commit '3b8ed0371fbe122bc3b3e28591061ace5e6b4884'
* commit '3b8ed0371fbe122bc3b3e28591061ace5e6b4884':
Remove "predefined" elements from Java layer. Static elements continue to exist but are no longer treated as a special version of element.
Merge commit '6e4b7d66998b9ec9255767f6070a2f94d83944a5' into eclair-plus-aosp
* commit '6e4b7d66998b9ec9255767f6070a2f94d83944a5':
Wallpapers: new transitions, hiding when not visible, other cleanup.
Merge commit 'da214787988ab6bf3c54d96072300723a72b9e3b' into eclair-plus-aosp
* commit 'da214787988ab6bf3c54d96072300723a72b9e3b':
Remove "predefined" elements from Java layer. Static elements continue to exist but are no longer treated as a special version of element.
Merge commit '63aca6389ce803e469624779f9e723eea00e1dfc'
* commit '63aca6389ce803e469624779f9e723eea00e1dfc':
When zooming, do not draw the WebTextView. Resize it when done.
Merge commit '608f9f470fa562fc6a32449297110d4ec2953515' into eclair-plus-aosp
* commit '608f9f470fa562fc6a32449297110d4ec2953515':
When zooming, do not draw the WebTextView. Resize it when done.
Merge commit 'dce5b2ce0908be0ac53c89e6ab50b2e71735f924'
* commit 'dce5b2ce0908be0ac53c89e6ab50b2e71735f924':
Clean up from earlier changes to place title bar at top of WebView
Merge commit '3c32474f0e0df419135f1966796d277aba9ee7cb' into eclair-plus-aosp
* commit '3c32474f0e0df419135f1966796d277aba9ee7cb':
Clean up from earlier changes to place title bar at top of WebView
