Merge commit 'db281311a0e957ba989509cf11f2085b4db12074' into froyo-plus-aosp
* commit 'db281311a0e957ba989509cf11f2085b4db12074':
Better diagnostics in the stagefright commandline tool, support for playing sine-tones using a filename of "sine:[samplingrate]", i.e. sine:44100. Support for playing audio through to the speakers by using "-o" in addition to "-a".
Merge commit 'c15f48d7d6047f4f7d7809673fc9728b368f9b0b' into froyo-plus-aosp
* commit 'c15f48d7d6047f4f7d7809673fc9728b368f9b0b':
Don't set encoder component role while we query decoders
Merge commit '763e62a831f6cf4e113bff868dab4d48560a3693' into froyo-plus-aosp
* commit '763e62a831f6cf4e113bff868dab4d48560a3693':
Fix a case introduced by https://android-git.corp.google.com/g/#change,47640
Merge commit '842d983cc3158a3de77a897d071b5b9c18dd2b55' into froyo-plus-aosp
* commit '842d983cc3158a3de77a897d071b5b9c18dd2b55':
Fix an upgrade bug in SettingsProvider.
Merge commit 'c30890e102cbae24e4c821ba4274f6ac8b18f1db' into froyo-plus-aosp
* commit 'c30890e102cbae24e4c821ba4274f6ac8b18f1db':
Fix bug 2578813 Delay pausing music and routing audio for car docks
Merge commit 'b19da8e187db1cf223463809148b7cb2d9e9751a' into froyo-plus-aosp
* commit 'b19da8e187db1cf223463809148b7cb2d9e9751a':
Fix for 2581725. Keep the last frame after resume(), and delete it
Merge commit '5baa5e1917ba4a212fa280b8b6cc3bbbf9382194' into froyo-plus-aosp
* commit '5baa5e1917ba4a212fa280b8b6cc3bbbf9382194':
Distinguish QCELP audio from mpeg4 audio, ignore QCELP audio tracks since we don't have a decoder for it, ignore potentially malformed metadata for AMR NB and WB tracks.
Merge commit '7e8614a547eca78dd9178001f8f6c38444adf350' into froyo-plus-aosp
* commit '7e8614a547eca78dd9178001f8f6c38444adf350':
SDK: more backup/restore documentation work
Merge commit 'b9e3e4ce7e8e57a28ce15680d406c83cba1eb63a' into froyo-plus-aosp
* commit 'b9e3e4ce7e8e57a28ce15680d406c83cba1eb63a':
API CHANGE: remove obsolete constants and hide some methods
Merge commit '6dbf80d086d03d95c5f6331719edd6dd6dac0361' into froyo-plus-aosp
* commit '6dbf80d086d03d95c5f6331719edd6dd6dac0361':
Fix a race condition in TimedEventQueue, an event may be cancelled while we're waiting for its scheduled time to come in which case we'd be removing it from the queue twice.
Merge commit '290a48b365479eccd16023b5de0d92063bb68b4d' into froyo-plus-aosp
* commit '290a48b365479eccd16023b5de0d92063bb68b4d':
Fix typos in name of density-independent pixels
Merge commit '1d7a8b448e9371685894b6b02d29bcd3ae959545' into froyo-plus-aosp
* commit '1d7a8b448e9371685894b6b02d29bcd3ae959545':
Fix a case where the aac hardware decoder is in a transition state and refused a fillbuffer request.
Merge commit '040301cad17e447d760e7b7e54b79c8c294415ea' into froyo-plus-aosp
* commit '040301cad17e447d760e7b7e54b79c8c294415ea':
Start sending out buffering updates earlier (after preparation has completed) instead of only after playback has started.
Merge commit '63284ede623ca8a4119f1f44b86fbf017faba8dc' into froyo-plus-aosp
* commit '63284ede623ca8a4119f1f44b86fbf017faba8dc':
Do not check mWebTextView's focus state to determine editing mode.
Merge commit '17de1532a950f7ee961debab93a7977292b7f1f3' into froyo-plus-aosp
* commit '17de1532a950f7ee961debab93a7977292b7f1f3':
Fix issue #2581524: Car home icon should always go to car home
Merge commit '5cc072522b51f796085a73545a3dd34a02877059' into froyo-plus-aosp
* commit '5cc072522b51f796085a73545a3dd34a02877059':
Add warning magic to be a bit more reasonable.
Merge commit '15b02f04c7b5e895dd8ebbb9448863a7d608b00f' into froyo-plus-aosp
* commit '15b02f04c7b5e895dd8ebbb9448863a7d608b00f':
Remove the checkStremingServer checking as it is unstable and introduce the flakiness.
Merge commit 'a18c824c029c14093b3d06d0a021c5397be667fb' into froyo-plus-aosp
* commit 'a18c824c029c14093b3d06d0a021c5397be667fb':
Fix a FATAL ClassCastException in DataConnection.java
Merge commit 'bc284a5f9f1e3f19ddd45cfb233f0d1775b612a7' into froyo-plus-aosp
* commit 'bc284a5f9f1e3f19ddd45cfb233f0d1775b612a7':
Move the public method HttpDateTime.parse() into AndroidHttpClient.
Merge commit 'a3c4c219c21e61ca4a642a35610dea07c437a647' into froyo-plus-aosp
* commit 'a3c4c219c21e61ca4a642a35610dea07c437a647':
final versions of these fonts from ascender, including GPOS 'mark' feature
Merge commit '34959e3fe87012d554af07fd6ad294b2ce3daea7' into froyo-plus-aosp
* commit '34959e3fe87012d554af07fd6ad294b2ce3daea7':
Do not create intents for application/xhtml+xml
Merge commit 'e67e6b94fd282283f1ffa2299fae536bee099715' into froyo-plus-aosp
* commit 'e67e6b94fd282283f1ffa2299fae536bee099715':
Set mHeldMotionless to a new MOTIONLESS_IGNORE state
