Merge commit 'ce37120df3099a1bb544ff1ef1a016a20794dd51'
* commit 'ce37120df3099a1bb544ff1ef1a016a20794dd51':
Fix bug where we would return null with disabled components.
Merge commit '4df43ab1d834f839f3b1e535554836a936902d00'
* commit '4df43ab1d834f839f3b1e535554836a936902d00':
Fix issue #1930911: Crash in system process
Merge commit 'e6566064a990fcfc21334df33eb9c771f22eb0d5'
* commit 'e6566064a990fcfc21334df33eb9c771f22eb0d5':
Finish off java API to allow fading scrollbars
Merge commit '019116ce202021e1b274516c9813aeff83b1b5ab'
* commit '019116ce202021e1b274516c9813aeff83b1b5ab':
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 '7d028a0a974fdee240cac7118bf47c96777ea533'
* commit '7d028a0a974fdee240cac7118bf47c96777ea533':
Separate API for vCards through openAssetFileDescriptor().
Merge commit 'b74e2ac44c72c846095334fab7f60111c1271f34'
* commit 'b74e2ac44c72c846095334fab7f60111c1271f34':
Modify the "active chats" uri to not overlap with other uris.
Merge commit '0d6d171af20e52b529c6f42885a2aca70e3a5cef'
* commit '0d6d171af20e52b529c6f42885a2aca70e3a5cef':
Print out all available EGL configurations.
Merge commit '39433f818b223aab50b264fb43e8e32da1d8151a'
* commit '39433f818b223aab50b264fb43e8e32da1d8151a':
Do not crash appwdiget host when a pending intent send fails.
Merge commit 'c78f617bb66123c224c833ed2bd151d588a9a06d'
* commit 'c78f617bb66123c224c833ed2bd151d588a9a06d':
Disable keyguard while docked when the lock screen is insecure.
Merge commit 'ccc624ca9a8fd8f9435afb854313aa9bda51b0b0'
* commit 'ccc624ca9a8fd8f9435afb854313aa9bda51b0b0':
Fix issue #2149145: Safe Mode does not work on Sholes device
Merge commit '1492b96eb178631b816bdb253a1b6d1df8133e13'
* commit '1492b96eb178631b816bdb253a1b6d1df8133e13':
Remove obsolete links; start at a method to turn on fading scrollbars
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.
Since we need to test the keystore with user system in order to test
the reset(), password(), lock() and unlock(), we have to take advantage
of the ActivityUnitTestCase to run the test with the user 'system'.
Both GlobalSearch and the search dialog now pass
SearchManager.SUGGEST_PARAMETER_LIMIT as a query parameter to all
suggestion sources. Exposing this allows suggestion sources
to return only the number of results that the client requires.
Fixes http://b/issue?id=2150992
Change-Id: I17f45d35e8f302b11812f4bb6fee40b31dc15707
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
Now that we can have a non-app-window cross-wallpaper animation,
we need to make sure to not access a null app token.
Change-Id: Ia00debd4b2b431d15bd074927a9035e1bc0a6445
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.
