Merge commit '0fdae4cc744c3be3855b47e82d2244df8503258c' into eclair-plus-aosp
* commit '0fdae4cc744c3be3855b47e82d2244df8503258c':
Use floor to calculate the range to avoid the rounding error triggered
* changes:
Use floor to calculate the range to avoid the rounding error triggered scrollbar. The worst case is that you can never scroll down to the last pixel. The old special case can cause problem when getViewWidth/Height have changed which do not match mLastXXSent any more.
Merge commit '6cb1330d26d2fe8a01c33ab3fbaee2bfebb6f47e' into eclair-plus-aosp
* commit '6cb1330d26d2fe8a01c33ab3fbaee2bfebb6f47e':
Tell GlobalSearch about searches without a suggestion
Merge commit '91e2d8651fe38a921b37a8bf8b3148c572cf9430' into eclair-plus-aosp
* commit '91e2d8651fe38a921b37a8bf8b3148c572cf9430':
Fix issue 2107584: media server crash when AudioFlinger fails to allocate memory for track control block.
Merge commit '3ccfaaa70f25c8343ab45974a7a43cf9b9b15903' into eclair-plus-aosp
* commit '3ccfaaa70f25c8343ab45974a7a43cf9b9b15903':
Add tests and misc fixes on keystore.
Merge commit '6085b4e7b5c592c398904748b56f95a77ced4ed5' into eclair-plus-aosp
* commit '6085b4e7b5c592c398904748b56f95a77ced4ed5':
Pass return code from Camera HAL for setParameters().
Merge commit '9a0bf14c4f715a8ffa645c77c4c183dcfa3e31c8' into eclair-plus-aosp
* commit '9a0bf14c4f715a8ffa645c77c4c183dcfa3e31c8':
Moving ImProvider to TalkProvider: Change Im.java to use the new TalkProvider; change the authority
Merge commit 'd2cc42733eb13063754c654921a58d34bfdb1c65' into eclair-plus-aosp
* commit 'd2cc42733eb13063754c654921a58d34bfdb1c65':
fix [2111536] [FAST BLOCKER] Device is soft rebooted after ending the call through voice dialer
Merge commit 'f376c837ea9d5b89c668ff8306f2a404bed4ff05' into eclair-plus-aosp
* commit 'f376c837ea9d5b89c668ff8306f2a404bed4ff05':
Don't init wifiChannels until after supplicant up
* changes:
modified: tests/MediaFrameworkTest/src/com/android/mediaframeworktest/MediaNames.java modified: tests/MediaFrameworkTest/src/com/android/mediaframeworktest/stress/MediaPlayerStressTest.java Fix the m4a1 duration and the also fix the random_seek time error in the stress test.
Merge commit '38eeac305a188b7ea4f586071c1d467c3f952be6' into eclair-plus-aosp
* commit '38eeac305a188b7ea4f586071c1d467c3f952be6':
Don't backup/restore telephony material from secure settings
Merge commit 'd3e061fc8f4a2a1e6b98ee43fd706ac09c786b61' into eclair-plus-aosp
* commit 'd3e061fc8f4a2a1e6b98ee43fd706ac09c786b61':
If disk-full, don't crash the system server. Still todo: when we have disk we should trigger the event again.
Merge commit '66c2a976705b62fe1721157e934b52d4a49de8f7' into eclair-plus-aosp
* commit '66c2a976705b62fe1721157e934b52d4a49de8f7':
dumpstate: Switch back to running as non-root
Merge commit '02ee5387d3b9904f18d639f4d49612f4b3563eed' into eclair-plus-aosp
* commit '02ee5387d3b9904f18d639f4d49612f4b3563eed':
Add @Widget annotation to GestureOverlayView to make it usable in ADT.
Merge commit '162ec9993e9695946a6b954fd53eebb63e055540' into eclair-plus-aosp
* commit '162ec9993e9695946a6b954fd53eebb63e055540':
Fix issue #1983406: Soft keyboard doesn't show up in an EditText with "digits" attribute set
Merge commit '8cae124af2142687a6833dbaab8a43df6dd67b43' into eclair-plus-aosp
* commit '8cae124af2142687a6833dbaab8a43df6dd67b43':
Various cleanup around resources and nine-patches.
Merge commit '7ff269f359a8848fd0c39993d8fe21a8324806f9' into eclair-plus-aosp
* commit '7ff269f359a8848fd0c39993d8fe21a8324806f9':
Handle DisconnectRequested message sent by Bluez.
Merge commit 'd68781ace179e19b70120411baf307104683fa4b' into eclair-plus-aosp
* commit 'd68781ace179e19b70120411baf307104683fa4b':
change default for dither to true
Merge commit 'b14a14194c64094cdffadeca1480b08c943215a9' into eclair-plus-aosp
* commit 'b14a14194c64094cdffadeca1480b08c943215a9':
Save and restore partial supplicant data, not the whole file.
Merge commit 'e1a9de7a2e52e534b3f6cb613a9b35bcc16ac84d' into eclair-plus-aosp
* commit 'e1a9de7a2e52e534b3f6cb613a9b35bcc16ac84d':
Only build the "full" stagefright (including MediaExtractors and MediaPlayer) if BUILD_WITH_FULL_STAGEFRIGHT define is set (to true).
