Merge commit '87937ae89e77c804b1b3c8fcc3d4225fa99390b7' into eclair-plus-aosp
* commit '87937ae89e77c804b1b3c8fcc3d4225fa99390b7':
Whoops, these shouldn't be public.
Merge commit 'd84e7d53d379c9fdfe335f40e89e2dfd6144dfea' into eclair-plus-aosp
* commit 'd84e7d53d379c9fdfe335f40e89e2dfd6144dfea':
Allow scrolls to continue when getting a new content size.
Merge commit 'b6eaaa2ab2a43193b6fec3790a7e413b8e28733a' into eclair-plus-aosp
* commit 'b6eaaa2ab2a43193b6fec3790a7e413b8e28733a':
Clean up cacheColorHint to be better controlled by the theme.
Merge commit '22cbf51ef5f374cb32be3295d7de3f7be404e5be' into eclair-plus-aosp
* commit '22cbf51ef5f374cb32be3295d7de3f7be404e5be':
Add PhoneNumberUtils.compare() method that uses a resource to determine strictness.
Merge commit 'ac5bd144f1add259d53f2e09dc0cef38f1f5bd3f' into eclair-plus-aosp
* commit 'ac5bd144f1add259d53f2e09dc0cef38f1f5bd3f':
Set roaming based on both data and voice.
Merge commit '9f9ce253648ad9dda16ae2fd3131073fe5643536' into eclair-plus-aosp
* commit '9f9ce253648ad9dda16ae2fd3131073fe5643536':
Fix the reporting of ActiveApnTypes on CDMA
Merge commit '7745e035c94409815850be4be93a300301da576e' into eclair-plus-aosp
* commit '7745e035c94409815850be4be93a300301da576e':
Skip requestRectangleOnScreen for WebTextView during
* changes:
Skip requestRectangleOnScreen for WebTextView during zoom animation. If it is in edit mode, we already adjust WebTextView in the end of zoom animation.
Merge commit '31522ad0ca71013ac5437a1a43e9078a31ff2213' into eclair-plus-aosp
* commit '31522ad0ca71013ac5437a1a43e9078a31ff2213':
Add unit test for the new keystore.
Merge commit '7eca687c2ee8f633678a1cd3ebf0886c0e6bbcf9' into eclair-plus-aosp
* commit '7eca687c2ee8f633678a1cd3ebf0886c0e6bbcf9':
Fix bug where we would return null with disabled components.
Merge commit 'ffc165446a7188cadfbc9f99fafac27d11254a54' into eclair-plus-aosp
* commit 'ffc165446a7188cadfbc9f99fafac27d11254a54':
Fix issue #1930911: Crash in system process
Merge commit 'a2f5afe6c690ad84aec046c4fa0178f2ee590c8e' into eclair-plus-aosp
* commit 'a2f5afe6c690ad84aec046c4fa0178f2ee590c8e':
Fix EVDO SNR signal bar calculation
Merge commit 'ff966d5f6c88a9fba033f1bb5ec087464376534d' into eclair-plus-aosp
* commit 'ff966d5f6c88a9fba033f1bb5ec087464376534d':
Fix but processing raster state pragma.
Merge commit '0368334db91e923021df36ae9afb81ed8256abfd' into eclair-plus-aosp
* commit '0368334db91e923021df36ae9afb81ed8256abfd':
Finish off java API to allow fading scrollbars
Merge commit '97702aacfc7f84b473357ce102cc70da2a316032' into eclair-plus-aosp
* commit '97702aacfc7f84b473357ce102cc70da2a316032':
Don't ask for pbuffer support, because we don't use any pbuffers.
Print out EGL configuration info for the config we've chosen.
Merge commit 'ff18bbf83562b8a827a37c19cdc27e520786119e' into eclair-plus-aosp
* commit 'ff18bbf83562b8a827a37c19cdc27e520786119e':
Separate API for vCards through openAssetFileDescriptor().
Merge commit '13a90abcae224b85d128ded8e59398a3fc1ce4e1' into eclair-plus-aosp
* commit '13a90abcae224b85d128ded8e59398a3fc1ce4e1':
Adding status update attribution to ContactHeaderWidget
Merge commit 'f36a2bb59b846545946124124d3290bd3eec44f0' into eclair-plus-aosp
* commit 'f36a2bb59b846545946124124d3290bd3eec44f0':
Call the proper variant of markAsContacted.
Merge commit '1cff74761798eba8349a3b9824ae4b11072c11d1' into eclair-plus-aosp
* commit '1cff74761798eba8349a3b9824ae4b11072c11d1':
Modify the "active chats" uri to not overlap with other uris.
