Merge commit '5da347dd2dc7de8828077057f4963b904018c5ec'
* commit '5da347dd2dc7de8828077057f4963b904018c5ec':
Add a new UEventObserver subclass to broadcast an Intent whe USB state changes.
DO NOT MERGE Add new permission to allow access to USB devices
Merge commit '477def1d4216f82bdfe58525131db88b384fc5a5' into gingerbread-plus-aosp
* commit '477def1d4216f82bdfe58525131db88b384fc5a5':
Add a new UEventObserver subclass to broadcast an Intent whe USB state changes.
DO NOT MERGE Add new permission to allow access to USB devices
* changes:
Add a new UEventObserver subclass to broadcast an Intent whe USB state changes.
DO NOT MERGE Add new permission to allow access to USB devices
Merge commit '0d964c94459e25b9b2221a7c7c789b29f77f15dd'
* commit '0d964c94459e25b9b2221a7c7c789b29f77f15dd':
Remove most stagefright property overrides, remove VorbisPlayer and VorbisMetadataRetriever as this functionality is now provided by stagefright.
Merge commit 'a2549bb644d8ca4b0209d6d2f0c4160521789aa9' into gingerbread-plus-aosp
* commit 'a2549bb644d8ca4b0209d6d2f0c4160521789aa9':
Remove most stagefright property overrides, remove VorbisPlayer and VorbisMetadataRetriever as this functionality is now provided by stagefright.
Merge commit '801b63d3b865054b3015e2cf315ca7c9386d1212'
* commit '801b63d3b865054b3015e2cf315ca7c9386d1212':
Need to give the AppWidgetHostView the new info about the provider, in case the initialLayout
Merge commit '51e895f055f76ad0114a18e1b754a1475a62c524' into gingerbread-plus-aosp
* commit '51e895f055f76ad0114a18e1b754a1475a62c524':
Need to give the AppWidgetHostView the new info about the provider, in case the initialLayout
Merge commit 'bc0793e4b77f1f8ec30294a4edac67dfca81f31d'
* commit 'bc0793e4b77f1f8ec30294a4edac67dfca81f31d':
Remember to initialize timestamps in the dispatch allocator
Merge commit '0379118827ef7e81a70e88e5910f5c7536d8b945' into gingerbread-plus-aosp
* commit '0379118827ef7e81a70e88e5910f5c7536d8b945':
Remember to initialize timestamps in the dispatch allocator
Merge commit '2d8e249854d134f87423646cc96d1cd9507a67b0'
* commit '2d8e249854d134f87423646cc96d1cd9507a67b0':
Fix bug 2772728 with the suggested fix. I wasn't able to reproduce it though.
Merge commit '4ca092c7f101cbd95833a9ed8936e9e0485585ad' into gingerbread-plus-aosp
* commit '4ca092c7f101cbd95833a9ed8936e9e0485585ad':
Fix bug 2772728 with the suggested fix. I wasn't able to reproduce it though.
Merge commit '90ade3f25d16afe8fd64ec1fcc5fede466256719'
* commit '90ade3f25d16afe8fd64ec1fcc5fede466256719':
Fixed some meta data issues in the recorded mp4 file
Merge commit '9afc1b3ed3eb8dbfb440600495d92def88934f54' into gingerbread-plus-aosp
* commit '9afc1b3ed3eb8dbfb440600495d92def88934f54':
Fixed some meta data issues in the recorded mp4 file
Merge commit '58e9402b12218ca498ea3b932e16819612b1ea87' into gingerbread-plus-aosp
* commit '58e9402b12218ca498ea3b932e16819612b1ea87':
Properly assign LOG_TAGs in OMXMaster.cpp and MediaScanner.cpp
Merge commit '800af39038dcded12b66eccb8932a761e20b1976'
* commit '800af39038dcded12b66eccb8932a761e20b1976':
Fix a number of timestamp mismatches in the mp3 extractor and decoder that would lead to invalid reporting of the current playback time for mono and/or non-44100 kHz mp3s.
Merge commit 'b64af9a221c1df4853ab7c7766d5f956c61b8765' into gingerbread-plus-aosp
* commit 'b64af9a221c1df4853ab7c7766d5f956c61b8765':
Fix a number of timestamp mismatches in the mp3 extractor and decoder that would lead to invalid reporting of the current playback time for mono and/or non-44100 kHz mp3s.
Merge commit 'bc337d2f675e8417be5534439e1b4ed1bc45a9c7'
* commit 'bc337d2f675e8417be5534439e1b4ed1bc45a9c7':
Fix a bug where requestDisallowInterceptTouchEvent does not get called
Merge commit '0c837a2e35ed0f6354cbfb3c0e20260b817fd1e9'
* commit '0c837a2e35ed0f6354cbfb3c0e20260b817fd1e9':
docs: update backup dev guide with Android Backup Service registration info
Merge commit '845f541454d1fa9f328c0b0bf79acf2fba363177'
* commit '845f541454d1fa9f328c0b0bf79acf2fba363177':
Added support for audio sessions in MediaPlayer and AudioTrack.
Merge commit '7d329785f3f3111d99d58f75ac4e44cf1a65915f'
* commit '7d329785f3f3111d99d58f75ac4e44cf1a65915f':
Fix issue 2301630: Mismatch of state occurs when media server is killed while in-call.
Merge commit '6adf0c4de62f0b13b84f18c6cda254a8dfeb2296'
* commit '6adf0c4de62f0b13b84f18c6cda254a8dfeb2296':
Make the prefetcher read packets from the network after a keep-alive timeout expires regardless of whether its currently actively fetching data or not.
Merge commit '235073a549ec664caea93e0ccded95e4a6819b6b'
* commit '235073a549ec664caea93e0ccded95e4a6819b6b':
Make sure sine: is supported again in stagefright commandline tool.
