Merge commit 'ce73c1e5bfd36154d21ee7b332cfdc6cea48812e' into froyo-plus-aosp
* commit 'ce73c1e5bfd36154d21ee7b332cfdc6cea48812e':
Framework change for #2583442: Navigation dies when night mode changes
Merge commit 'ae8c2c71f7791ed0321e56f31f0c1276da4d8842' into froyo-plus-aosp
* commit 'ae8c2c71f7791ed0321e56f31f0c1276da4d8842':
Fix issue #2420340: if FLAG_SHOW_WHEN_LOCKED, do not show keyguard...
Merge commit 'ba6339fe2ba2d7325a99201e82d951064efa31a2' into froyo-plus-aosp
* commit 'ba6339fe2ba2d7325a99201e82d951064efa31a2':
If we defer processing the touch events, pass the
Merge commit 'd3bb93f6870581eebbf08b5b7fb0a9c5eaad8b16' into froyo-plus-aosp
* commit 'd3bb93f6870581eebbf08b5b7fb0a9c5eaad8b16':
Add build config values for data use defaults
Merge commit 'dd684af8c8fd5984d4d40b125bfac1ce268622ae' into froyo-plus-aosp
* commit 'dd684af8c8fd5984d4d40b125bfac1ce268622ae':
Snif more 3GPP file types according to http://www.ftyps.com/3gpp.html
Merge commit '812b24fd9d254f37e34f2878f599253a1f3bffe9' into froyo-plus-aosp
* commit '812b24fd9d254f37e34f2878f599253a1f3bffe9':
Fix crashes related to unmounting when app on sdcard has an active notification
Merge commit '3069a6dafabd5a6ba2b1378e2c3b48adb9ba8778' into froyo-plus-aosp
* commit '3069a6dafabd5a6ba2b1378e2c3b48adb9ba8778':
SDK: last of the backup/restore docs content
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.
