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).
Merge commit '40351ecec878910d7f0ac6988cd8010dc82b0a99' into eclair-plus-aosp
* commit '40351ecec878910d7f0ac6988cd8010dc82b0a99':
Minor changes to api levels doc and upgrading doc. Change Linux "tested on" to Hardy Heron.
Merge commit '8a948de56d8061659e04c70e5c6b34c9b6fb844b' into eclair-plus-aosp
* commit '8a948de56d8061659e04c70e5c6b34c9b6fb844b':
Move API change details from highlights doc to version notes doc.
Merge commit '7350ff3d572624abb5a46c3c4969e0b91cb05109' into eclair
* commit '7350ff3d572624abb5a46c3c4969e0b91cb05109':
Minor changes to api levels doc and upgrading doc. Change Linux "tested on" to Hardy Heron.
Merge commit '18dd1eeb23a700ba37604d521d7eab8a371f9dc5' into eclair
* commit '18dd1eeb23a700ba37604d521d7eab8a371f9dc5':
Move API change details from highlights doc to version notes doc.
Merge commit 'f84a21820b39dbfa983352b7d8ac949e560827d3' into eclair-plus-aosp
* commit 'f84a21820b39dbfa983352b7d8ac949e560827d3':
fix [2112575] stuck on DequeueCondition for a surface that doesn't exist anymore
Merge commit '12d2cdcdb0eed759b0e7738cbdefaa726a71930b' into eclair-plus-aosp
* commit '12d2cdcdb0eed759b0e7738cbdefaa726a71930b':
make sure conditions will return when the status of a surface is not NO_ERROR
