Merge commit '0ff9212d077e77f8b3e0afa232293306c0f72d07' into kraken
* commit '0ff9212d077e77f8b3e0afa232293306c0f72d07':
Handle throttling being disabled via policy change
Merge commit '19681af44b7c7494ae8de28dab8aacc3e9d92390' into froyo-plus-aosp
* commit '19681af44b7c7494ae8de28dab8aacc3e9d92390':
Handle throttling being disabled via policy change
Merge commit '31431b34f895862ae13efba30bb5771085572687' into kraken
* commit '31431b34f895862ae13efba30bb5771085572687':
Switch to use software MP3 decoder
Merge commit '374aee6888edddc5bcac9a644ad3de812404d3bc' into froyo-plus-aosp
* commit '374aee6888edddc5bcac9a644ad3de812404d3bc':
Switch to use software MP3 decoder
Merge commit '60ae65ed30564969b3e14642394c5e22c019125d' into kraken
* commit '60ae65ed30564969b3e14642394c5e22c019125d':
Restrict the range request to the servers claiming
Merge commit '7fca18d4eadd3da0e616f2663aca41be4a01ec2f' into kraken
* commit '7fca18d4eadd3da0e616f2663aca41be4a01ec2f':
Fix aapt to build in Windows SDK under Linux
Merge commit 'bd17156fda946fa0594687337bbd43cd85300940' into kraken
* commit 'bd17156fda946fa0594687337bbd43cd85300940':
Only honor the scrollbar mode at the minimum zoom
Merge commit '87782f2bdfc679fd8f3c7ae7cd72bfd0e71efdc6' into froyo-plus-aosp
* commit '87782f2bdfc679fd8f3c7ae7cd72bfd0e71efdc6':
Restrict the range request to the servers claiming
Merge commit '29355534384ee24bfe9a3bc97d7664dbe478b4fb' into froyo-plus-aosp
* commit '29355534384ee24bfe9a3bc97d7664dbe478b4fb':
Fix aapt to build in Windows SDK under Linux
Merge commit '85a8dcec5460edda72e9917d4f02ad1b6a133251' into froyo-plus-aosp
* commit '85a8dcec5460edda72e9917d4f02ad1b6a133251':
Only honor the scrollbar mode at the minimum zoom
Merge commit 'cdf96f75da540d880ae6070d861aeb6adabbe9a3' into kraken
* commit 'cdf96f75da540d880ae6070d861aeb6adabbe9a3':
Fix typo when parsing external platform version from Settings.
Merge commit '8b0047f82504ebc9b282ed950a85a758b59c4e14' into froyo-plus-aosp
* commit '8b0047f82504ebc9b282ed950a85a758b59c4e14':
Fix typo when parsing external platform version from Settings.
Merge commit 'f6adae7866e893afa05b5838bdd244648a66ac3f' into kraken
* commit 'f6adae7866e893afa05b5838bdd244648a66ac3f':
Fix bug 2619062 Music is routed to Phone speaker, though it is
Merge commit '47dad8fa8d1eddf31dd0665a6d341e2f4f593d08' into froyo-plus-aosp
* commit '47dad8fa8d1eddf31dd0665a6d341e2f4f593d08':
Fix bug 2619062 Music is routed to Phone speaker, though it is
Merge commit '27e5a95afc10faca6314f9b710f07e8f99b3311f' into kraken
* commit '27e5a95afc10faca6314f9b710f07e8f99b3311f':
Re-enabling unit tests for PackageManager/Apps on SD.
Merge commit '5fa65082f16741394dcfbe756e3880d5c018dace' into froyo-plus-aosp
* commit '5fa65082f16741394dcfbe756e3880d5c018dace':
Re-enabling unit tests for PackageManager/Apps on SD.
Merge commit 'b6c770e4e387bd73d4e7d4cbad99079b37f59043' into kraken
* commit 'b6c770e4e387bd73d4e7d4cbad99079b37f59043':
Respond to changes in throttle policy.
Merge commit '0b2ebe9b45172b9147f86fd69eedb2a200982b68' into froyo-plus-aosp
* commit '0b2ebe9b45172b9147f86fd69eedb2a200982b68':
Respond to changes in throttle policy.
Merge commit 'dc14dc6d60675be688c333bbc60a315d2c658054' into kraken
* commit 'dc14dc6d60675be688c333bbc60a315d2c658054':
Some debugging help for issue #2594388
Merge commit 'bf73bbffc18f5abb5350fa3a410830c05ad10206' into froyo-plus-aosp
* commit 'bf73bbffc18f5abb5350fa3a410830c05ad10206':
Some debugging help for issue #2594388
Merge commit '1b5a9c5d2fdf353d12ef1ca11dafc78f4c6f6c81' into kraken
* commit '1b5a9c5d2fdf353d12ef1ca11dafc78f4c6f6c81':
Add a Throttle check shortly after boot.
Merge commit '251ccef0445d4456809bfc41a6344e2dae24f2c3' into froyo-plus-aosp
* commit '251ccef0445d4456809bfc41a6344e2dae24f2c3':
Add a Throttle check shortly after boot.
Merge commit '4bcdd6b0688735d7da0eb2a4f211b4b4c8911e3b' into kraken
* commit '4bcdd6b0688735d7da0eb2a4f211b4b4c8911e3b':
Fix issue #2619247: Music sometimes stops playing when navigation talks
Merge commit '476a57e64a7fa7143e434c1064df1fa87fe4b01a' into kraken
* commit '476a57e64a7fa7143e434c1064df1fa87fe4b01a':
Fix issue #2608292: Fails to launch the video camera preview
Merge commit '90c6aec10f969acf9b171b82920480fb6aeb007f' into froyo-plus-aosp
* commit '90c6aec10f969acf9b171b82920480fb6aeb007f':
Fix issue #2619247: Music sometimes stops playing when navigation talks
Merge commit '9bc0a572d8459e0b6209e8a68cb680389c1f8b73' into froyo-plus-aosp
* commit '9bc0a572d8459e0b6209e8a68cb680389c1f8b73':
Fix issue #2608292: Fails to launch the video camera preview
Merge commit 'a298d6fd2a920e8ff2dfd5fd03a2f95cbce5451f' into kraken
* commit 'a298d6fd2a920e8ff2dfd5fd03a2f95cbce5451f':
Fix error code when media is filled up.